Changeset 74676 in vbox for trunk/src/VBox/Runtime/common/ldr/ldrMachO.cpp

Timestamp:

Oct 8, 2018 12:51:07 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/ldr: Mach-O underscore kludge. bugref:9232

File:

• trunk/src/VBox/Runtime/common/ldr/ldrMachO.cpp (modified) (8 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrMachO.cpp

@@ -1748 +1748 @@
     {
         /* simplify validation. */
-        if (cchStrings <= cchSymbol)
+        /** @todo figure out a better way to deal with underscore prefixes. sigh. */
+        if (cchStrings <= cchSymbol + 1)
             return VERR_SYMBOL_NOT_FOUND;
-        cchStrings -= cchSymbol;
+        cchStrings -= cchSymbol + 1;
 
         /* external symbols are usually at the end, so search the other way. */
@@ -1773 +1774 @@
                 continue;
             psz = &pchStrings[paSyms[iSymbol].n_un.n_strx];
-            if (psz[cchSymbol])
+            if (psz[cchSymbol + 1])
                 continue;
-            if (memcmp(psz, pchSymbol, cchSymbol))
+            /** @todo figure out a better way to deal with underscore prefixes. sigh. */
+            if (*psz != '_' || memcmp(psz + 1, pchSymbol, cchSymbol))
                 continue;
 
@@ -1876 +1878 @@
     {
         /* simplify validation. */
-        if (cchStrings <= cchSymbol)
+        /** @todo figure out a better way to deal with underscore prefixes. sigh. */
+        if (cchStrings <= cchSymbol + 1)
             return VERR_SYMBOL_NOT_FOUND;
-        cchStrings -= cchSymbol;
+        cchStrings -= cchSymbol + 1;
 
         /* external symbols are usually at the end, so search the other way. */
@@ -1901 +1904 @@
                 continue;
             psz = &pchStrings[paSyms[iSymbol].n_un.n_strx];
-            if (psz[cchSymbol])
+            if (psz[cchSymbol + 1])
                 continue;
-            if (memcmp(psz, pchSymbol, cchSymbol))
+            if (*psz != '_' || memcmp(psz + 1, pchSymbol, cchSymbol))
                 continue;
 
@@ -2128 +2131 @@
          * Do callback.
          */
+        /** @todo figure out a better way to deal with underscore prefixes. sigh. */
+        if (cch > 1 && *psz == '_')
+            psz++;
         rc = pfnCallback(&pThis->Core, psz, iSym, uValue/*, fKind*/, pvUser);
         if (rc != VINF_SUCCESS)
@@ -2240 +2246 @@
          * Do callback.
          */
+        /** @todo figure out a better way to deal with underscore prefixes. sigh. */
+        if (cch > 1 && *psz == '_')
+            psz++;
         rc = pfnCallback(&pThis->Core, psz, iSym, uValue/*, fKind*/, pvUser);
         if (rc != VINF_SUCCESS)
@@ -2609 +2618 @@
 
                 /* Ask the user for an address to the symbol. */
+                /** @todo figure out a better way to deal with underscore prefixes. sigh. */
                 if (RT_FAILURE_NP(rc))
-                    rc = pfnGetImport(&pThis->Core, NULL /*pszModule*/, pszSymbol, iSym, &Value/*, &fKind*/, pvUser);
+                    rc = pfnGetImport(&pThis->Core, NULL /*pszModule*/, pszSymbol + (pszSymbol[0] == '_'),
+                                      UINT32_MAX, &Value/*, &fKind*/, pvUser);
                 if (RT_FAILURE(rc))
                 {
@@ -2668 +2679 @@
 
                 /* Ask the user for an address to the symbol. */
+                /** @todo figure out a better way to deal with underscore prefixes. sigh. */
                 if (RT_FAILURE_NP(rc))
-                    rc = pfnGetImport(&pThis->Core, NULL, pszSymbol, iSym, &Value, /*&fKind,*/ pvUser);
+                    rc = pfnGetImport(&pThis->Core, NULL, pszSymbol + (*pszSymbol == '_'),
+                                      UINT32_MAX, &Value, /*&fKind,*/ pvUser);
                 if (RT_FAILURE(rc))
                 {