Changeset 46916 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jul 2, 2013 5:22:10 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86911

Message:

dbgmoddwarf.cpp: Ignore abbreviations with code 0, they're just fillers it seems.

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp

@@ -2841 +2841 @@
         for (;;)
         {
-            /* Read the 'header'. */
+            /* Read the 'header'. Skipping zero code bytes. */
             uint32_t const uCurCode  = rtDwarfCursor_GetULeb128AsU32(&Cursor, 0);
-            uint32_t const uCurTag   = rtDwarfCursor_GetULeb128AsU32(&Cursor, 0);
-            uint8_t  const uChildren = rtDwarfCursor_GetU8(&Cursor, 0);
-            if (RT_FAILURE(Cursor.rc))
-                break;
-            if (   uCurTag > 0xffff
-                || uChildren > 1)
+            if (uCurCode != 0)
             {
-                Cursor.rc = VERR_DWARF_BAD_ABBREV;
-                break;
+                uint32_t const uCurTag   = rtDwarfCursor_GetULeb128AsU32(&Cursor, 0);
+                uint8_t  const uChildren = rtDwarfCursor_GetU8(&Cursor, 0);
+                if (RT_FAILURE(Cursor.rc))
+                    break;
+                if (   uCurTag > 0xffff
+                    || uChildren > 1)
+                {
+                    Cursor.rc = VERR_DWARF_BAD_ABBREV;
+                    break;
+                }
+
+                /* Cache it? */
+                if (uCurCode <= pThis->cCachedAbbrevsAlloced)
+                {
+                    PRTDWARFABBREV pEntry = &pThis->paCachedAbbrevs[uCurCode - 1];
+                    while (pThis->cCachedAbbrevs < uCurCode)
+                    {
+                        pThis->paCachedAbbrevs[pThis->cCachedAbbrevs].fFilled = false;
+                        pThis->cCachedAbbrevs++;
+                    }
+
+                    pEntry->fFilled   = true;
+                    pEntry->fChildren = RT_BOOL(uChildren);
+                    pEntry->uTag      = uCurTag;
+                    pEntry->offSpec   = rtDwarfCursor_CalcSectOffsetU32(&Cursor);
+
+                    if (uCurCode == uCode)
+                    {
+                        pRet = pEntry;
+                        if (uCurCode == pThis->cCachedAbbrevsAlloced)
+                            break;
+                    }
+                }
+
+                /* Skip the specification. */
+                uint32_t uAttr, uForm;
+                do
+                {
+                    uAttr = rtDwarfCursor_GetULeb128AsU32(&Cursor, 0);
+                    uForm = rtDwarfCursor_GetULeb128AsU32(&Cursor, 0);
+                } while (uAttr != 0);
             }
-
-            /* Cache it? */
-            if (uCurCode <= pThis->cCachedAbbrevsAlloced)
-            {
-                PRTDWARFABBREV pEntry = &pThis->paCachedAbbrevs[uCurCode - 1];
-                while (pThis->cCachedAbbrevs < uCurCode)
-                {
-                    pThis->paCachedAbbrevs[pThis->cCachedAbbrevs].fFilled = false;
-                    pThis->cCachedAbbrevs++;
-                }
-
-                pEntry->fFilled   = true;
-                pEntry->fChildren = RT_BOOL(uChildren);
-                pEntry->uTag      = uCurTag;
-                pEntry->offSpec   = rtDwarfCursor_CalcSectOffsetU32(&Cursor);
-
-                if (uCurCode == uCode)
-                {
-                    pRet = pEntry;
-                    if (uCurCode == pThis->cCachedAbbrevsAlloced)
-                        break;
-                }
-            }
-
-            /* Skip the specification. */
-            uint32_t uAttr, uForm;
-            do
-            {
-                uAttr = rtDwarfCursor_GetULeb128AsU32(&Cursor, 0);
-                uForm = rtDwarfCursor_GetULeb128AsU32(&Cursor, 0);
-            } while (uAttr != 0);
             if (RT_FAILURE(Cursor.rc))
                 break;