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

branch merge

Browse Source 
branch 'default'
   changed src/pefile.cpp
   changed src/pefile.h
This commit is contained in:
John Reiser 2016-01-31 20:11:42 -08:00
commit 9cb8fbf178
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pefile.cpp
View File

@ -1494,8 +1494,12 @@ struct PeFile::Resource::upx_rleaf : public PeFile::Resource::upx_rnode
res_data data; res_data data;
}; };
PeFile::Resource::Resource() : root(NULL) PeFile::Resource::Resource(const upx_byte *ibufstart_,
{} const upx_byte *ibufend_) : root(NULL)
{
ibufstart = ibufstart_;
ibufend = ibufend_;
}
PeFile::Resource::Resource(const upx_byte *p, PeFile::Resource::Resource(const upx_byte *p,
const upx_byte *ibufstart_, const upx_byte *ibufstart_,
@ -2126,8 +2130,8 @@ unsigned PeFile::readSections(unsigned objs, unsigned usize,
== (PEFL_WRITE|PEFL_SHARED))) == (PEFL_WRITE|PEFL_SHARED)))
if (!opt->force) if (!opt->force)
throwCantPack("writable shared sections not supported (try --force)"); throwCantPack("writable shared sections not supported (try --force)");
if (jc && isection[ic].rawdataptr - jc > ih_filealign) if (jc && isection[ic].rawdataptr - jc > ih_filealign && !opt->force)
throwCantPack("superfluous data between sections"); throwCantPack("superfluous data between sections (try --force)");
fi->seek(isection[ic].rawdataptr,SEEK_SET); fi->seek(isection[ic].rawdataptr,SEEK_SET);
jc = isection[ic].size; jc = isection[ic].size;
if (jc > isection[ic].vsize) if (jc > isection[ic].vsize)
@ -2194,7 +2198,7 @@ void PeFile::pack0(OutputFile *fo, ht &ih, ht &oh,
overlay = 0; overlay = 0;
checkOverlay(overlay); checkOverlay(overlay);
Resource res; Resource res(ibuf, ibuf + ibuf.getSize());
Interval tlsiv(ibuf); Interval tlsiv(ibuf);
Interval loadconfiv(ibuf); Interval loadconfiv(ibuf);
Export xport((char*)(unsigned char*)ibuf); Export xport((char*)(unsigned char*)ibuf);

2
src/pefile.h
View File

@ -353,7 +353,7 @@ protected:
void ibufcheck(const void *m, unsigned size); void ibufcheck(const void *m, unsigned size);
public: public:
Resource(); Resource(const upx_byte *ibufstart, const upx_byte *ibufen);
Resource(const upx_byte *p, const upx_byte *ibufstart, Resource(const upx_byte *p, const upx_byte *ibufstart,
const upx_byte *ibufend); const upx_byte *ibufend);
~Resource(); ~Resource();