jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Return value of FileBase::seek(, SEEK_CUR) was not FileBase::tell()

Browse Source 
modified:   file.cpp
This commit is contained in:
John Reiser
2022-12-19 13:37:24 -08:00
committed by Markus F.X.J. Oberhumer
parent c23c7a9379
commit 3649041195
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/file.cpp
+5 -2
View File
@@ -117,6 +117,7 @@ void FileBase::closex() {
throwIOException("close failed", errno); throwIOException("close failed", errno);
} }
// Return value of ::seek is the resulting file offset (same as ::tell())
upx_off_t FileBase::seek(upx_off_t off, int whence) { upx_off_t FileBase::seek(upx_off_t off, int whence) {
if (!isOpen()) if (!isOpen())
throwIOException("bad seek 1"); throwIOException("bad seek 1");
@@ -132,9 +133,11 @@ upx_off_t FileBase::seek(upx_off_t off, int whence) {
off += _offset + _length; off += _offset + _length;
whence = SEEK_SET; whence = SEEK_SET;
} }
if (::lseek(_fd, off, whence) < 0) // SEEK_CUR falls through to here
upx_off_t rv = ::lseek(_fd, off, whence);
if (0 == (1+ rv)) // lazy coding to check for "-1" failure of ::lseek
throwIOException("seek error", errno); throwIOException("seek error", errno);
return off - _offset; return rv - _offset;
} }
upx_off_t FileBase::tell() const { upx_off_t FileBase::tell() const {