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

Modernize libc usage: stop using off_t, use modern printf.

Browse Source 
C++ 14 is here, and old versions of MSVC and MSVCRT have
haunted us long enough.
This commit is contained in:
Markus F.X.J. Oberhumer
2021-01-05 18:52:05 +01:00
parent b4429e1a42
commit 700c8730cf
19 changed files with 130 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_djgpp2.cpp
+8 -7
View File
@@ -161,24 +161,25 @@ static bool is_dlm(InputFile *fi, unsigned coff_offset)
static void handle_allegropak(InputFile *fi, OutputFile *fo)
{
unsigned char buf[0x4000];
unsigned char b[8];
int pfsize = 0;
try {
fi->seek(-8, SEEK_END);
fi->readx(buf, 8);
if (memcmp(buf, "slh+", 4) != 0)
fi->readx(b, 8);
if (memcmp(b, "slh+", 4) != 0)
return;
pfsize = get_be32_signed(buf+4);
if (pfsize <= 8 || pfsize >= (off_t) fi->st.st_size)
pfsize = get_be32_signed(b+4);
if (pfsize <= 8 || pfsize >= fi->st.st_size)
return;
fi->seek(-(off_t)pfsize, SEEK_END);
fi->seek(-pfsize, SEEK_END);
} catch (const IOException&) {
return;
}
MemBuffer buf(0x4000);
while (pfsize > 0)
{
const int len = UPX_MIN(pfsize, (int)sizeof(buf));
const int len = UPX_MIN(pfsize, (int)buf.getSize());
fi->readx(buf, len);
fo->write(buf, len);
pfsize -= len;