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

Added Packer::getLoaderSectionStart(), where the size of the section

Browse Source 
is allowed to be zero.

committer: mfx <mfx> 976719893 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2000-12-13 15:04:53 +00:00
parent d465077f13
commit d266c6bff1
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_vmlinz.cpp
View File

@ -156,7 +156,7 @@ void PackvmlinuzI386::pack(OutputFile *fo)
MemBuffer loader(lsize);
memcpy(loader, getLoader(), lsize);
int e_len = bzImage ? getLoaderSection("LZCUTPOI") : lsize;
int e_len = bzImage ? getLoaderSectionStart("LZCUTPOI") : lsize;
patchPackHeader(loader, lsize);
if (bzImage)

29
src/packer.cpp
View File

@ -42,7 +42,7 @@
Packer::Packer(InputFile *f) :
fi(f), file_size(-1), ph_format(-1), ph_version(-1),
uip(NULL), ui_pass(0), ui_total_passes(0), linker(NULL),
last_patch(NULL), last_patch_offset(0)
last_patch(NULL), last_patch_len(0), last_patch_off(0)
{
file_size = f->st.st_size;
uip = new UiPacker(this);
@ -642,22 +642,28 @@ void Packer::checkPatch(void *b, int blen, int boff, int size)
{
// reset
last_patch = NULL;
last_patch_offset = 0;
last_patch_len = 0;
last_patch_off = 0;
return;
}
if (b == NULL || blen <= 0 || boff < 0 || size <= 0)
throwBadLoader();
if (boff + size <= 0 || boff + size > blen)
throwBadLoader();
//printf("checkPatch: %p %5d %5d %d\n", b, blen, boff, size);
//printf("checkPatch: %p %5d %5d %2d\n", b, blen, boff, size);
if (b == last_patch)
{
if (boff + size > last_patch_offset)
if (boff + size > last_patch_off)
throwInternalError("invalid patch order");
// The next check is not strictly necessary, but the buffer
// length should better not increase...
if (blen > last_patch_len)
throwInternalError("invalid patch order (length)");
}
else
last_patch = b;
last_patch_offset = boff;
last_patch_len = blen;
last_patch_off = boff;
}
@ -916,7 +922,7 @@ void Packer::addSection(const char *sname, const char *sdata, unsigned len)
}
int Packer::getLoaderSection(const char *name, int *slen)
int Packer::getLoaderSection(const char *name, int *slen) const
{
int size = -1;
int ostart = linker->getSection(name, &size);
@ -928,6 +934,17 @@ int Packer::getLoaderSection(const char *name, int *slen)
}
// same, but the size of the section may be == 0
int Packer::getLoaderSectionStart(const char *name) const
{
int size = -1;
int ostart = linker->getSection(name, &size);
if (ostart < 0 || size < 0)
throwBadLoader();
return ostart;
}
const upx_byte *Packer::getLoader() const
{
int size = -1;

6
src/packer.h
View File

@ -199,7 +199,8 @@ protected:
virtual void initLoader(const void *pdata, int plen, int pinfo=-1);
virtual void addLoader(const char *s, ...);
virtual void addSection(const char *sname, const char *sdata, unsigned len);
virtual int getLoaderSection(const char *name, int *slen = NULL);
virtual int getLoaderSection(const char *name, int *slen=NULL) const;
virtual int getLoaderSectionStart(const char *name) const;
virtual void addFilter32(int filter_id);
virtual const char *getDecompressor() const;
@ -253,7 +254,8 @@ private:
private:
// private to checkPatch()
void *last_patch;
int last_patch_offset;
int last_patch_len;
int last_patch_off;
private:
// disable copy and assignment