c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix io buf seek bug

Browse Source
This commit is contained in:
Nathan Moinvaziri 2012-05-07 00:39:30 -07:00
parent 5507aa75ab
commit 0b262c6b2f
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ioapi_buf.c
View File

@ -276,11 +276,15 @@ long ZCALLBACK fseek_buf_func (opaque, stream, offset, origin)
} }
if (bufio->readBufferLength > 0) if (bufio->readBufferLength > 0)
{ {
if ((origin == ZLIB_FILEFUNC_SEEK_CUR) && (offset < bufio->readBufferLength)) if (origin == ZLIB_FILEFUNC_SEEK_CUR)
{ {
bufio->readBufferLength -= offset; if (offset <= bufio->readBufferLength)
memcpy(bufio->readBuffer, bufio->readBuffer + offset, bufio->readBufferLength); {
return 0; bufio->readBufferLength -= offset;
memcpy(bufio->readBuffer, bufio->readBuffer + offset, bufio->readBufferLength);
return 0;
}
offset -= bufio->readBufferLength;
} }
bufio->readBufferLength = 0; bufio->readBufferLength = 0;
} }
@ -310,11 +314,15 @@ long ZCALLBACK fseek64_buf_func (opaque, stream, offset, origin)
} }
if (bufio->readBufferLength > 0) if (bufio->readBufferLength > 0)
{ {
if ((origin == ZLIB_FILEFUNC_SEEK_CUR) && (offset < bufio->readBufferLength)) if (origin == ZLIB_FILEFUNC_SEEK_CUR)
{ {
bufio->readBufferLength -= (uLong)offset; if (offset <= bufio->readBufferLength)
memcpy(bufio->readBuffer, bufio->readBuffer + (uLong)offset, bufio->readBufferLength); {
return 0; bufio->readBufferLength -= (uLong)offset;
memcpy(bufio->readBuffer, bufio->readBuffer + (uLong)offset, bufio->readBufferLength);
return 0;
}
offset -= bufio->readBufferLength;
} }
bufio->readBufferLength = 0; bufio->readBufferLength = 0;
} }