Changeset 1019 for trunk/dll/fortify.c

Timestamp:

May 26, 2008, 11:02:41 PM (17 years ago)

Author:

Steven Levine

Message:

Show TID for leaking scope

File:

• trunk/dll/fortify.c (modified) (7 diffs)

trunk/dll/fortify.c

@@ -42 +42 @@
 
  /* 06 May 08 SHL Rework scope logic to be MT capable
+    26 May 08 SHL Show TID for leaking scope
  */
 
@@ -66 +67 @@
 #define MT_SCOPES 1
 unsigned long Get_TID_Ordinal(void);
+// Get tib_ptib2 from TIB
+// Get thread id from TIB2
 #pragma aux Get_TID_Ordinal = \
- "mov eax, far ptr fs:[0x14]" \
- modify exact [eax] \
+ "mov ebx, fs:[0xc]" \
+ "mov eax, [ebx+0]" \
+ modify exact [eax ebx] \
  value [eax]
 #endif
@@ -252 +256 @@
 
 #ifdef MT_SCOPES
-    unsigned short ordinal;
+    unsigned ordinal;
 #endif
 
@@ -686 +690 @@
 #ifdef MT_SCOPES
     ordinal = Get_TID_Ordinal();
-    if(ordinal < st_cScopes && st_pScopes[ordinal] > 0)
+    if (ordinal < st_cScopes && st_pScopes[ordinal] > 0)
 #else
     if(st_Scope > 0)
@@ -1004 +1008 @@
 
 #ifdef MT_SCOPES
-    // 06 May 08 SHL fixme to complain to leave without enter
+    // Complain on leave without enter 06 May 08 SHL
     ordinal = Get_TID_Ordinal();
     if (ordinal < st_cScopes && st_pScopes[ordinal] > 0)
         st_pScopes[ordinal]--;
     else {
-        sprintf(st_Buffer, "\nFortify: attempting to leave scope before enter at %s.%lu\n", file, line);
+        sprintf(st_Buffer,
+                "\nFortify: attempting to leave scope before enter at %s.%lu in TID %u\n",
+                file, line, ordinal);   // 26 May 08 SHL
         st_Output(st_Buffer);
     }
@@ -1031 +1037 @@
             {
                 // Report just first occurrance
+#ifdef MT_SCOPES
+                sprintf(st_Buffer,
+                        "\nFortify: Memory leak detected leaving scope at %s.%lu in TID %u\n",
+                        file, line, ordinal);
+#else
                 sprintf(st_Buffer, "\nFortify: Memory leak detected leaving scope at %s.%lu\n", file, line);
+#endif
                 st_Output(st_Buffer);
                 sprintf(st_Buffer, "%10s %8s %s\n", "Address", "Size", "Allocator");
@@ -1680 +1692 @@
     unsigned long FreedBlocks = 0;
 #ifdef MT_SCOPES
-    unsigned short ordinal = Get_TID_Ordinal();
+    unsigned ordinal = Get_TID_Ordinal();
 #endif