Some cleanups.

committer: mfx <mfx> 962208107 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2000-06-28 16:01:47 +00:00
parent 51c6566092
commit 3980081a5a
5 changed files with 39 additions and 22 deletions
+10 -4
View File
@@ -572,15 +572,21 @@ void Packer::putPackHeader(upx_bytep buf, unsigned len)
bool Packer::readPackHeader(unsigned len, off_t seek_offset, upx_byte *buf)
{
unsigned char hbuf[1024];
assert((int)len > 0);
MemBuffer hbuf;
if (buf == NULL)
{
assert(len <= sizeof(hbuf));
hbuf.alloc(len);
buf = hbuf;
}
memset(buf, 0, len);
if (seek_offset >= 0)
fi->seek(seek_offset, SEEK_SET);
if (seek_offset != -1)
{
if (seek_offset >= 0)
fi->seek(seek_offset, SEEK_SET);
}
len = fi->read(buf,len);
if (!ph.fillPackHeader(buf, len))