Changeset 21610 for trunk/src/kernel32/exceptions.cpp

Timestamp:

Apr 7, 2011, 2:28:29 AM (14 years ago)

Author:

dmik

Message:

kernel32: Fixed: Parsing .SYM files when printing the stack trace in debug mode was not thread safe which caused garbage and nested crashes.

File:

• trunk/src/kernel32/exceptions.cpp (modified) (10 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -116 +116 @@
 static void sprintfException(PEXCEPTIONREPORTRECORD pERepRec, PEXCEPTIONREGISTRATIONRECORD pERegRec, PCONTEXTRECORD pCtxRec, PVOID p, PSZ szTrapDump);
 
-static char szTrapDump[2048] = {0};
-
 #ifdef DEBUG
 void PrintWin32ExceptionChain(PWINEXCEPTION_FRAME pframe);
@@ -709 +707 @@
                              PSZ                          szTrapDump)
 {
-// @@VP20040507: This function uses a static buffer szTrapDump, therefore
-//               any local buffers also can be made static to save
-//               stack space and possibly avoid out of stack exception.
     if(pERepRec->ExceptionNum == XCPT_GUARD_PAGE_VIOLATION)
     {
@@ -727 +722 @@
     ULONG  ulModule;                                          /* module number */
     ULONG  ulObject;                        /* object number within the module */
-static    CHAR   szModule[260];                        /* buffer for the module name */
+    CHAR   szModule[260];                        /* buffer for the module name */
     ULONG  ulOffset;             /* offset within the object within the module */
-static    char   szLineException[128];
-static    char   szLineExceptionType[128];
+    char   szLineException[512];
+    char   szLineExceptionType[128];
 
     szLineException[0]  = 0;                                              /* initialize */
@@ -952 +947 @@
         sprintf(szTrapDump + strlen(szTrapDump), "   %s\n", szLineExceptionType);
 
+    sprintf(szLineException, "   Exception Address = %08x ", pERepRec->ExceptionAddress);
+    strcat(szTrapDump, szLineException);
+
     rc = DosQueryModFromEIP(&ulModule, &ulObject, sizeof(szModule),
                             szModule, &ulOffset, (ULONG)pERepRec->ExceptionAddress);
 
-    sprintf(szLineException, "   Exception Address = %08x ", pERepRec->ExceptionAddress);
-    strcat(szTrapDump, szLineException);
-
     if(rc == NO_ERROR && ulObject != -1)
     {
-        sprintf(szLineException, "<%.*s> (#%u) obj #%u:%08x", 64, szModule, ulModule, ulObject, ulOffset);
+        sprintf(szLineException, "<%8.8s> (%04X) obj %04X:%08X", szModule, ulModule, ulObject + 1, ulOffset);
 #ifdef RAS
-        static char szSYMInfo[260];
-        static char Name[260];
-
-        DosQueryModuleName(ulModule, sizeof(Name), Name);
-
-        int namelen = strlen(Name);
+        char szSYMInfo[260];
+
+        DosQueryModuleName(ulModule, sizeof(szModule), szModule);
+
+        int namelen = strlen(szModule);
         if(namelen > 3)
         {
-                strcpy(Name + namelen - 3, "SYM");
-                dbgGetSYMInfo(Name, ulObject, ulOffset, szSYMInfo, sizeof (szSYMInfo));
-                strcat(szLineException, " ");
-                strcat(szLineException, szSYMInfo);
-        }
+                strcpy(szModule + namelen - 3, "SYM");
+                dbgGetSYMInfo(szModule, ulObject, ulOffset, szSYMInfo, sizeof (szSYMInfo),
+                          FALSE);
+            strcat(szLineException, " ");
+            strcat(szLineException, szSYMInfo);
+        }
 #else
         strcat(szLineException, "\n");
@@ -993 +988 @@
             ulObject = 0xFF;
             ulOffset = (ULONG)pERepRec->ExceptionAddress - (ULONG)pMod->getInstanceHandle();
-            sprintf(szLineException, "<%.*s> (#%u) obj #%u:%08x\n", 64, szModule, ulModule, ulObject, ulOffset);
+            sprintf(szLineException, "<%8.8s> (%04X) obj %04X:%08X", szModule, ulModule, ulObject, ulOffset);
         }
         else sprintf(szLineException, "<unknown win32 module>\n");
@@ -1079 +1074 @@
                              PVOID                        p)
 {
+    char szTrapDump[2048];
+    szTrapDump[0] = '\0';
     sprintfException(pERepRec, pERegRec, pCtxRec, p, szTrapDump);
 #ifdef RAS
@@ -1154 +1151 @@
             DosWrite(hFile, lpszTime, strlen(lpszTime), &ulBytesWritten);
         }
+
+        char szTrapDump[2048];
+        szTrapDump[0] = '\0';
         sprintfException(pERepRec, pERegRec, pCtxRec, p, szTrapDump);
 #ifdef RAS
@@ -1757 +1757 @@
  PEXCEPTIONREGISTRATIONRECORD pExceptRec = (PEXCEPTIONREGISTRATIONRECORD)QueryExceptionChain();
 
-  dprintf(("Exception chain list:"));
-  while(pExceptRec != 0 && (ULONG)pExceptRec != -1) {
-        dprintf(("record %x", pExceptRec));
+  dprintf(("OS/2 Exception chain:"));
+  while(pExceptRec != 0 && (ULONG)pExceptRec != -1)
+  {
+      char szBuf[512];
+      ULONG ulModule;
+      ULONG ulObject, ulOffset;
+      CHAR szModule[260];
+
+      *szBuf = '\0';
+      APIRET rc = DosQueryModFromEIP(&ulModule, &ulObject, sizeof(szModule),
+                                     szModule, &ulOffset, (ULONG)pExceptRec->ExceptionHandler);
+      if(rc == NO_ERROR && ulObject != -1)
+      {
+        sprintf(szBuf, " <%8.8s> (%04X) obj %04X:%08X", szModule, ulModule, ulObject + 1, ulOffset);
+#ifdef RAS
+        char szSYMInfo[260];
+
+        DosQueryModuleName(ulModule, sizeof(szModule), szModule);
+
+        int namelen = strlen(szModule);
+        if(namelen > 3)
+        {
+            strcpy(szModule + namelen - 3, "SYM");
+            dbgGetSYMInfo(szModule, ulObject, ulOffset,
+                          szSYMInfo, sizeof (szSYMInfo), TRUE);
+            strcat(szBuf, " ");
+            strcat(szBuf, szSYMInfo);
+            // remove trailing \n or space
+            szBuf[strlen(szBuf) - 1] = '\0';
+        }
+#endif
+      }
+      else
+      {
+          *szBuf = '\0';
+      }
+
+        dprintf(("  record %08X, prev %08X, handler %08X%s",
+                 pExceptRec, pExceptRec->prev_structure, pExceptRec->ExceptionHandler,
+                 szBuf));
+
         pExceptRec = pExceptRec->prev_structure;
   }
+  dprintf(("END of OS/2 Exception chain."));
   SetFS(sel);
 }
@@ -1770 +1809 @@
   dprintf(("Win32 exception chain:"));
   while ((pframe != NULL) && ((ULONG)pframe != 0xFFFFFFFF)) {
-        dprintf(("Record at %08X, Prev at %08X, handler at %08X", pframe, pframe->Prev, pframe->Handler));
+        dprintf(("  Record at %08X, Prev at %08X, handler at %08X", pframe, pframe->Prev, pframe->Handler));
         if (pframe == pframe->Prev) {
             dprintf(("Chain corrupted! Record at %08X pointing to itself!", pframe));
@@ -1777 +1816 @@
         pframe = pframe->Prev;
   }
+  dprintf(("END of Win32 exception chain."));
 }