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

pe: added support for empty resource section

Browse Source
This commit is contained in:
László Molnár 2006-05-24 17:14:09 +02:00
parent 91051d2521
commit f914cb6858
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/p_armpe.cpp
View File

@ -1244,10 +1244,7 @@ void Resource::check(const res_dir *node,unsigned level)
{ {
int ic = node->identr + node->namedentr; int ic = node->identr + node->namedentr;
if (ic == 0) if (ic == 0)
{ return;
//throwCantPack("unsupported resource structure");
throwCantPack("empty resource sections are not supported");
}
for (const res_dir_entry *rde = node->entries; --ic >= 0; rde++) for (const res_dir_entry *rde = node->entries; --ic >= 0; rde++)
if (((rde->child & 0x80000000) == 0) ^ (level == 2)) if (((rde->child & 0x80000000) == 0) ^ (level == 2))
throwCantPack("unsupported resource structure"); throwCantPack("unsupported resource structure");
@ -1273,10 +1270,14 @@ Resource::upx_rnode *Resource::convert(const void *rnode,upx_rnode *parent,unsig
} }
const res_dir *node = (const res_dir *) rnode; const res_dir *node = (const res_dir *) rnode;
int ic = node->identr + node->namedentr;
if (ic == 0)
return NULL;
upx_rbranch *branch = new upx_rbranch; upx_rbranch *branch = new upx_rbranch;
branch->name = NULL; branch->name = NULL;
branch->parent = parent; branch->parent = parent;
int ic = branch->nc = node->identr + node->namedentr; branch->nc = ic;
branch->children = new upx_rnode*[ic]; branch->children = new upx_rnode*[ic];
branch->data = *node; branch->data = *node;
@ -2401,7 +2402,7 @@ void PackArmPe::rebuildTls()
void PackArmPe::rebuildResources(upx_byte *& extrainfo) void PackArmPe::rebuildResources(upx_byte *& extrainfo)
{ {
if (ODSIZE(PEDIR_RESOURCE) == 0) if (ODSIZE(PEDIR_RESOURCE) == 0 || IDSIZE(PEDIR_RESOURCE) == 0)
return; return;
icondir_count = get_le16(extrainfo); icondir_count = get_le16(extrainfo);

13
src/p_w32pe.cpp
View File

@ -1204,10 +1204,7 @@ void Resource::check(const res_dir *node,unsigned level)
{ {
int ic = node->identr + node->namedentr; int ic = node->identr + node->namedentr;
if (ic == 0) if (ic == 0)
{ return;
//throwCantPack("unsupported resource structure");
throwCantPack("empty resource sections are not supported");
}
for (const res_dir_entry *rde = node->entries; --ic >= 0; rde++) for (const res_dir_entry *rde = node->entries; --ic >= 0; rde++)
if (((rde->child & 0x80000000) == 0) ^ (level == 2)) if (((rde->child & 0x80000000) == 0) ^ (level == 2))
throwCantPack("unsupported resource structure"); throwCantPack("unsupported resource structure");
@ -1233,10 +1230,14 @@ Resource::upx_rnode *Resource::convert(const void *rnode,upx_rnode *parent,unsig
} }
const res_dir *node = (const res_dir *) rnode; const res_dir *node = (const res_dir *) rnode;
int ic = node->identr + node->namedentr;
if (ic == 0)
return NULL;
upx_rbranch *branch = new upx_rbranch; upx_rbranch *branch = new upx_rbranch;
branch->name = NULL; branch->name = NULL;
branch->parent = parent; branch->parent = parent;
int ic = branch->nc = node->identr + node->namedentr; branch->nc = ic;
branch->children = new upx_rnode*[ic]; branch->children = new upx_rnode*[ic];
branch->data = *node; branch->data = *node;
@ -2495,7 +2496,7 @@ void PackW32Pe::rebuildTls()
void PackW32Pe::rebuildResources(upx_byte *& extrainfo) void PackW32Pe::rebuildResources(upx_byte *& extrainfo)
{ {
if (ODSIZE(PEDIR_RESOURCE) == 0) if (ODSIZE(PEDIR_RESOURCE) == 0 || IDSIZE(PEDIR_RESOURCE) == 0)
return; return;
icondir_count = get_le16(extrainfo); icondir_count = get_le16(extrainfo);