FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-22 09:56:22 +01:00
Code Issues 2 Projects Releases Wiki Activity

filesystem: fix stringop-overflow

Browse Source
This commit is contained in:
Alibek Omarov 2023-08-06 00:44:32 +03:00
parent e7f5cb6910
commit 8bdb49516d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
filesystem/filesystem.c
View File

@ -2056,8 +2056,9 @@ Read up to "buffersize" bytes from a file
*/ */
fs_offset_t FS_Read( file_t *file, void *buffer, size_t buffersize ) fs_offset_t FS_Read( file_t *file, void *buffer, size_t buffersize )
{ {
fs_offset_t count, done; fs_offset_t done;
fs_offset_t nb; fs_offset_t nb;
size_t count;
// nothing to copy // nothing to copy
if( buffersize == 0 ) return 1; if( buffersize == 0 ) return 1;
@ -2077,7 +2078,7 @@ fs_offset_t FS_Read( file_t *file, void *buffer, size_t buffersize )
{ {
count = file->buff_len - file->buff_ind; count = file->buff_len - file->buff_ind;
done += ((fs_offset_t)buffersize > count ) ? count : (fs_offset_t)buffersize; done += ( buffersize > count ) ? (fs_offset_t)count : (fs_offset_t)buffersize;
memcpy( buffer, &file->buff[file->buff_ind], done ); memcpy( buffer, &file->buff[file->buff_ind], done );
file->buff_ind += done; file->buff_ind += done;
@ -2095,10 +2096,10 @@ fs_offset_t FS_Read( file_t *file, void *buffer, size_t buffersize )
// if we have a lot of data to get, put them directly into "buffer" // if we have a lot of data to get, put them directly into "buffer"
if( buffersize > sizeof( file->buff ) / 2 ) if( buffersize > sizeof( file->buff ) / 2 )
{ {
if( count > (fs_offset_t)buffersize ) if( count > buffersize )
count = (fs_offset_t)buffersize; count = buffersize;
lseek( file->handle, file->offset + file->position, SEEK_SET ); lseek( file->handle, file->offset + file->position, SEEK_SET );
nb = read (file->handle, &((byte *)buffer)[done], count ); nb = read( file->handle, (byte *)buffer + done, count );
if( nb > 0 ) if( nb > 0 )
{ {
@ -2110,8 +2111,8 @@ fs_offset_t FS_Read( file_t *file, void *buffer, size_t buffersize )
} }
else else
{ {
if( count > (fs_offset_t)sizeof( file->buff )) if( count > sizeof( file->buff ))
count = (fs_offset_t)sizeof( file->buff ); count = sizeof( file->buff );
lseek( file->handle, file->offset + file->position, SEEK_SET ); lseek( file->handle, file->offset + file->position, SEEK_SET );
nb = read( file->handle, file->buff, count ); nb = read( file->handle, file->buff, count );