walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed crash on zero-byte read/write (thanks, Ensiform!).

This commit is contained in:
Ryan C. Gordon 2007-07-11 22:11:29 +00:00
parent c27fd9639f
commit c5ee3d965c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.txt
View File

@ -2,6 +2,7 @@
* CHANGELOG. * CHANGELOG.
*/ */
07112007 - Fixed crash on zero-byte read/write (thanks, Ensiform!).
05272007 - FIXME removal: Replaced a strncpy() with a memcpy(). 05272007 - FIXME removal: Replaced a strncpy() with a memcpy().
05112007 - Minor documentation correction. 05112007 - Minor documentation correction.
05052007 - Fixed zip archiver: could do bogus seek if a small, non-zip file 05052007 - Fixed zip archiver: could do bogus seek if a small, non-zip file

4
physfs.c
View File

@ -1978,6 +1978,8 @@ PHYSFS_sint64 PHYSFS_read(PHYSFS_File *handle, void *buffer,
FileHandle *fh = (FileHandle *) handle; FileHandle *fh = (FileHandle *) handle;
BAIL_IF_MACRO(!fh->forReading, ERR_FILE_ALREADY_OPEN_W, -1); BAIL_IF_MACRO(!fh->forReading, ERR_FILE_ALREADY_OPEN_W, -1);
BAIL_IF_MACRO(objSize == 0, NULL, 0);
BAIL_IF_MACRO(objCount == 0, NULL, 0);
if (fh->buffer != NULL) if (fh->buffer != NULL)
return(doBufferedRead(fh, buffer, objSize, objCount)); return(doBufferedRead(fh, buffer, objSize, objCount));
@ -2011,6 +2013,8 @@ PHYSFS_sint64 PHYSFS_write(PHYSFS_File *handle, const void *buffer,
FileHandle *fh = (FileHandle *) handle; FileHandle *fh = (FileHandle *) handle;
BAIL_IF_MACRO(fh->forReading, ERR_FILE_ALREADY_OPEN_R, -1); BAIL_IF_MACRO(fh->forReading, ERR_FILE_ALREADY_OPEN_R, -1);
BAIL_IF_MACRO(objSize == 0, NULL, 0);
BAIL_IF_MACRO(objCount == 0, NULL, 0);
if (fh->buffer != NULL) if (fh->buffer != NULL)
return(doBufferedWrite(handle, buffer, objSize, objCount)); return(doBufferedWrite(handle, buffer, objSize, objCount));