Changeset 46266 in vbox for trunk/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h

Timestamp:

May 25, 2013 7:51:19 PM (12 years ago)

Author:

vboxsync

Message:

IPRT: Changed RTLDRSEG::pchName to pszName and make sure it's always set to something. Started on implementing a codeview reader.

File:

• trunk/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h (modified) (2 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h

@@ -1095 +1095 @@
      * Do the enumeration.
      */
+    char            szName[32];
     const Elf_Shdr *paShdrs    = pModElf->paShdrs;
     const Elf_Shdr *paOrgShdrs = pModElf->paOrgShdrs;
@@ -1100 +1101 @@
     {
         RTLDRSEG Seg;
-        Seg.pchName     = ELF_SH_STR(pModElf, paShdrs[iShdr].sh_name);
-        Seg.cchName     = (uint32_t)strlen(Seg.pchName);
+        Seg.pszName     = ELF_SH_STR(pModElf, paShdrs[iShdr].sh_name);
+        Seg.cchName     = (uint32_t)strlen(Seg.pszName);
+        if (Seg.cchName == 0)
+        {
+            Seg.pszName = szName;
+            Seg.cchName = (uint32_t)RTStrPrintf(szName, sizeof(szName), "UnamedSect%02u", iShdr);
+        }
         Seg.SelFlat     = 0;
         Seg.Sel16bit    = 0;