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

Cleaned up Packer::readPackHeader().

Browse Source 
committer: mfx <mfx> 977342419 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2000-12-20 20:00:19 +00:00
parent 7d652fa42b
commit 1e1a078808
11 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/packer.cpp
+13 -19
View File
@@ -594,26 +594,9 @@ int Packer::patchPackHeader(void *b, int blen)
}
bool Packer::readPackHeader(unsigned len, off_t seek_offset, upx_byte *buf)
bool Packer::getPackHeader(void *b, int blen)
{
assert((int)len > 0);
MemBuffer hbuf;
if (buf == NULL)
{
hbuf.alloc(len);
buf = hbuf;
}
memset(buf, 0, len);
if (seek_offset != -1)
{
if (seek_offset >= 0)
fi->seek(seek_offset, SEEK_SET);
}
len = fi->read(buf,len);
if (!ph.fillPackHeader(buf, len))
if (!ph.fillPackHeader((unsigned char *)b, blen))
return false;
if (ph.version > getVersion())
@@ -649,6 +632,17 @@ bool Packer::readPackHeader(unsigned len, off_t seek_offset, upx_byte *buf)
}
bool Packer::readPackHeader(int len)
{
assert((int)len > 0);
MemBuffer buf(len);
len = fi->read(buf, len);
if (len <= 0)
return false;
return getPackHeader(buf, len);
}
/*************************************************************************
// patch util for loader
**************************************************************************/