VFSPAK: Make Seek sanity check pak-relative.

ciscon · ciscon · commit d36d23449ecb · 2024-02-24T16:30:03.000-05:00
From mvdsv 1765473df456c147c12881739ffbc452e9bb3728 fixes #880
diff --git a/src/vfs_pak.c b/src/vfs_pak.c
@@ -96,6 +96,7 @@ static int VFSPAK_WriteBytes (struct vfsfile_s *vfs, const void *buffer, int byt
 static int VFSPAK_Seek (struct vfsfile_s *vfs, unsigned long offset, int whence)
 {
 	vfspack_t *vfsp = (vfspack_t*)vfs;
+	int rel_offset;
 
 	// VFS-FIXME Support other whence types
 	switch(whence) {
@@ -113,7 +114,8 @@ static int VFSPAK_Seek (struct vfsfile_s *vfs, unsigned long offset, int whence)
 		return -1;
 	}
 
-	if (vfsp->currentpos > vfsp->length) {
+	rel_offset = vfsp->currentpos - vfsp->startpos;
+	if (rel_offset < 0 || rel_offset >= vfsp->length) {
 		Com_Printf("VFSPAK_Seek: Warning seeking past the file's size\n");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ static int VFSPAK_WriteBytes (struct vfsfile_s vfs, const void buffer, int byt`
`96`	`96`	`static int VFSPAK_Seek (struct vfsfile_s *vfs, unsigned long offset, int whence)`
`97`	`97`	`{`
`98`	`98`	`vfspack_t vfsp = (vfspack_t)vfs;`
	`99`	`+ int rel_offset;`
`99`	`100`
`100`	`101`	`// VFS-FIXME Support other whence types`
`101`	`102`	`switch(whence) {`
`@@ -113,7 +114,8 @@ static int VFSPAK_Seek (struct vfsfile_s *vfs, unsigned long offset, int whence)`
`113`	`114`	`return -1;`
`114`	`115`	`}`
`115`	`116`
`116`		`- if (vfsp->currentpos > vfsp->length) {`
	`117`	`+ rel_offset = vfsp->currentpos - vfsp->startpos;`
	`118`	`+ if (rel_offset < 0 \|\| rel_offset >= vfsp->length) {`
`117`	`119`	`Com_Printf("VFSPAK_Seek: Warning seeking past the file's size\n");`
`118`	`120`	`}`
`119`	`121`