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

Validate header CERT_FI id:000000,sig:11,src:000000,op:flip1,pos:1

Browse Source
This commit is contained in:
John Reiser
2015-05-08 19:22:24 -07:00
parent 35944cbfc1
commit 82a51f35ea
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_mach.cpp
+12 -4
View File
@@ -1250,12 +1250,20 @@ void PackMachBase<T>::pack1(OutputFile *const fo, Filter &/*ft*/) // generate e
return; return;
} }
#define WANT_MACH_HEADER_ENUM 1
#include "p_mach_enum.h"
template <class T> template <class T>
void PackMachBase<T>::unpack(OutputFile *fo) void PackMachBase<T>::unpack(OutputFile *fo)
{ {
unsigned const lc_seg = lc_segment[sizeof(Addr)>>3]; unsigned const lc_seg = lc_segment[sizeof(Addr)>>3];
fi->seek(0, SEEK_SET); fi->seek(0, SEEK_SET);
fi->readx(&mhdri, sizeof(mhdri)); fi->readx(&mhdri, sizeof(mhdri));
if (!fo // -t (test) mode
&& (MH_MAGIC + (sizeof(Addr)>>3)) != mhdri.magic
&& Mach_fat_header::FAT_MAGIC != mhdri.magic) {
throwCantUnpack("file header corrupted");
}
rawmseg = (Mach_segment_command *)new char[(unsigned) mhdri.sizeofcmds]; rawmseg = (Mach_segment_command *)new char[(unsigned) mhdri.sizeofcmds];
fi->readx(rawmseg, mhdri.sizeofcmds); fi->readx(rawmseg, mhdri.sizeofcmds);
@@ -1657,12 +1665,12 @@ void PackMachFat::unpack(OutputFile *fo)
bool PackMachFat::canPack() bool PackMachFat::canPack()
{ {
struct Mach_fat_arch *arch = &fat_head.arch[0]; struct Mach_fat_arch const *const arch = &fat_head.arch[0];
fi->readx(&fat_head, sizeof(fat_head)); fi->readx(&fat_head, sizeof(fat_head));
unsigned const nfat = check_fat_head(); unsigned const nfat = check_fat_head();
for (unsigned j=0; j < nfat; ++j) { for (unsigned j=0; j < nfat; ++j) {
fi->set_extent(fat_head.arch[j].offset, fat_head.arch[j].size); fi->set_extent(arch[j].offset, arch[j].size);
fi->seek(0, SEEK_SET); fi->seek(0, SEEK_SET);
switch (arch[j].cputype) { switch (arch[j].cputype) {
default: default:
@@ -1707,7 +1715,7 @@ bool PackMachFat::canPack()
int PackMachFat::canUnpack() int PackMachFat::canUnpack()
{ {
struct Mach_fat_arch *arch = &fat_head.arch[0]; struct Mach_fat_arch const *const arch = &fat_head.arch[0];
fi->readx(&fat_head, sizeof(fat_head)); fi->readx(&fat_head, sizeof(fat_head));
unsigned const nfat = check_fat_head(); unsigned const nfat = check_fat_head();
@@ -1715,7 +1723,7 @@ int PackMachFat::canUnpack()
return false; return false;
} }
for (unsigned j=0; j < nfat; ++j) { for (unsigned j=0; j < nfat; ++j) {
fi->set_extent(fat_head.arch[j].offset, fat_head.arch[j].size); fi->set_extent(arch[j].offset, arch[j].size);
fi->seek(0, SEEK_SET); fi->seek(0, SEEK_SET);
switch (arch[j].cputype) { switch (arch[j].cputype) {
default: return false; default: return false;