branch merge

src/p_armpe.cpp

@@ -35,6 +35,7 @@
 
 static const
 #include "stub/l_armpea.h"
+static const
 #include "stub/l_armpet.h"
 
 #define IDSIZE(x)       ih.ddirs[x].size
@@ -245,6 +246,7 @@ void PackArmPe::createLinker(const void *pdata, int plen, int pinfo)
         linker = new ArmLinker(pdata, plen, pinfo);
 }
 
+
 /*************************************************************************
 // util
 **************************************************************************/
@@ -1220,7 +1222,6 @@ public:
     void dump() const { dump(root,0); }
     unsigned iname() const {return current->parent->id;}
     const upx_byte *nname() const {return current->parent->name;}
-
 /*
     unsigned ilang() const {return current->id;}
     const upx_byte *nlang() const {return current->name;}
@@ -1244,10 +1245,7 @@ void Resource::check(const res_dir *node,unsigned level)
 {
     int ic = node->identr + node->namedentr;
     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++)
         if (((rde->child & 0x80000000) == 0) ^ (level == 2))
             throwCantPack("unsupported resource structure");
@@ -1273,10 +1271,14 @@ Resource::upx_rnode *Resource::convert(const void *rnode,upx_rnode *parent,unsig
     }
 
     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;
     branch->name = NULL;
     branch->parent = parent;
-    int ic = branch->nc = node->identr + node->namedentr;
+    branch->nc = ic;
     branch->children = new upx_rnode*[ic];
     branch->data = *node;
 
@@ -2401,7 +2403,7 @@ void PackArmPe::rebuildTls()
 
 void PackArmPe::rebuildResources(upx_byte *& extrainfo)
 {
-    if (ODSIZE(PEDIR_RESOURCE) == 0)
+    if (ODSIZE(PEDIR_RESOURCE) == 0 || IDSIZE(PEDIR_RESOURCE) == 0)
         return;
 
     icondir_count = get_le16(extrainfo);

src/p_w32pe.cpp

@@ -1178,7 +1178,6 @@ public:
     bool clear();
 
     void dump() const { dump(root,0); }
-
     unsigned iname() const {return current->parent->id;}
     const upx_byte *nname() const {return current->parent->name;}
 /*
@@ -1204,10 +1203,7 @@ void Resource::check(const res_dir *node,unsigned level)
 {
     int ic = node->identr + node->namedentr;
     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++)
         if (((rde->child & 0x80000000) == 0) ^ (level == 2))
             throwCantPack("unsupported resource structure");
@@ -1233,10 +1229,14 @@ Resource::upx_rnode *Resource::convert(const void *rnode,upx_rnode *parent,unsig
     }
 
     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;
     branch->name = NULL;
     branch->parent = parent;
-    int ic = branch->nc = node->identr + node->namedentr;
+    branch->nc = ic;
     branch->children = new upx_rnode*[ic];
     branch->data = *node;
 
@@ -2495,7 +2495,7 @@ void PackW32Pe::rebuildTls()
 
 void PackW32Pe::rebuildResources(upx_byte *& extrainfo)
 {
-    if (ODSIZE(PEDIR_RESOURCE) == 0)
+    if (ODSIZE(PEDIR_RESOURCE) == 0 || IDSIZE(PEDIR_RESOURCE) == 0)
         return;
 
     icondir_count = get_le16(extrainfo);