Changeset 85

Timestamp:

Sep 6, 2016, 5:21:04 AM (9 years ago)

Author:

bird

Message:

fixes

Location:

trunk

Files:

• kHlp/Generic/kHlpGetFilename.c (modified) (3 diffs)
• kLdr/kLdrModPE.c (modified) (3 diffs)

trunk/kHlp/Generic/kHlpGetFilename.c

@@ -5 +5 @@
 
 /*
- * Copyright (c) 2006-2007 Knut St. Osmundsen <bird-kStuff-spamix@anduin.net>
+ * Copyright (c) 2006-2016 Knut St. Osmundsen <bird-kStuff-spamix@anduin.net>
  *
  * Permission is hereby granted, free of charge, to any person
@@ -45 +45 @@
 KHLP_DECL(char *) kHlpGetFilename(const char *pszFilename)
 {
-    const char *pszLast = NULL;
+    const char *pszLast = pszFilename;
     for (;;)
     {
@@ -64 +64 @@
         }
 #endif
-        if (!ch)
-            return (char *)(pszLast ? pszLast : pszFilename);
-        pszFilename++;
+        if (ch)
+            pszFilename++;
+        else
+            return (char *)pszLast;
     }
 }

trunk/kLdr/kLdrModPE.c

@@ -336 +336 @@
         pMod->aSegments[i + 1].pchName = pch = (const char *)&pModPE->aShdrs[i].Name[0];
         cb = IMAGE_SIZEOF_SHORT_NAME;
-        while (     cb > 0
-               &&   (pch[cb - 1] == ' ' || pch[cb - 1] == '\0'))
+        while (   cb > 0
+               && (pch[cb - 1] == ' ' || pch[cb - 1] == '\0'))
             cb--;
         pMod->aSegments[i + 1].cchName = cb;
@@ -344 +344 @@
         if (!(pModPE->aShdrs[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD))
         {
+            /* Kluge to deal with wlink ".reloc" sections that has a VirtualSize of 0 bytes. */
+            KU32 cb = pModPE->aShdrs[i].Misc.VirtualSize;
+            if (!cb)
+                cb = K_ALIGN_Z(pModPE->aShdrs[i].SizeOfRawData, pModPE->Hdrs.OptionalHeader.SectionAlignment);
             pMod->aSegments[i + 1].cb          = pModPE->aShdrs[i].Misc.VirtualSize;
             pMod->aSegments[i + 1].LinkAddress = pModPE->aShdrs[i].VirtualAddress
                                                + pModPE->Hdrs.OptionalHeader.ImageBase;
             pMod->aSegments[i + 1].RVA         = pModPE->aShdrs[i].VirtualAddress;
-            pMod->aSegments[i + 1].cbMapped    = pModPE->aShdrs[i].Misc.VirtualSize;
+            pMod->aSegments[i + 1].cbMapped    = cb;
             if (i + 2 < pMod->cSegments)
                 pMod->aSegments[i + 1].cbMapped= pModPE->aShdrs[i + 1].VirtualAddress
@@ -363 +367 @@
         /* file location */
         pMod->aSegments[i + 1].offFile = pModPE->aShdrs[i].PointerToRawData;
-        pMod->aSegments[i + 1].cbFile = pModPE->aShdrs[i].SizeOfRawData;
+        pMod->aSegments[i + 1].cbFile  = pModPE->aShdrs[i].SizeOfRawData;
         if (    pMod->aSegments[i + 1].cbMapped > 0 /* if mapped */
             &&  (KLDRSIZE)pMod->aSegments[i + 1].cbFile > pMod->aSegments[i + 1].cbMapped)