Fix fprintf calls on Windows

pSymbol->Address is ULONG64 but fprintf's %p format on x86 expects 32-bits. Fixes nodejs#26
richardlau · Dec 5, 2016 · 84cb4e4 · 84cb4e4
1 parent 95a046e
commit 84cb4e4
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/src/node_report.cc b/src/node_report.cc
@@ -598,21 +598,20 @@ void PrintNativeStack(FILE* fp) {
     pSymbol->MaxNameLen = MAX_SYM_NAME;
 
     if (SymFromAddr(hProcess, dwAddress, &dwOffset64, pSymbol)) {
-        DWORD dwOffset = 0;
-        IMAGEHLP_LINE64 line;
-        line.SizeOfStruct = sizeof(line);
-        if (SymGetLineFromAddr64(hProcess, dwAddress, &dwOffset, &line)) {
-          fprintf(fp, "%2d: [pc=0x%p] %s [+%d] in %s: line: %lu\n", i, pSymbol->Address, pSymbol->Name, dwOffset, line.FileName, line.LineNumber);
-        } else {
-          // SymGetLineFromAddr64() failed, just print the address and symbol
-          if (dwOffset64 <= 32) { // sanity check
-            fprintf(fp, "%2d: [pc=0x%p] %s [+%d]\n", i, pSymbol->Address, pSymbol->Name, dwOffset64);
-          } else {
-            fprintf(fp, "%2d: [pc=0x%p]\n", i, pSymbol->Address);
-          }
-        }
+      DWORD dwOffset = 0;
+      IMAGEHLP_LINE64 line;
+      line.SizeOfStruct = sizeof(line);
+      if (SymGetLineFromAddr64(hProcess, dwAddress, &dwOffset, &line)) {
+        fprintf(fp, "%2d: [pc=0x%p] %s [+%d] in %s: line: %lu\n", i,
+          reinterpret_cast<void*>(pSymbol->Address), pSymbol->Name,
+          dwOffset, line.FileName, line.LineNumber);
+      } else {
+        fprintf(fp, "%2d: [pc=0x%p] %s [+%lld]\n", i,
+          reinterpret_cast<void*>(pSymbol->Address), pSymbol->Name,
+          dwOffset64);
+      }
     } else { // SymFromAddr() failed, just print the address
-      fprintf(fp, "%2d: [pc=0x%p]\n", i, pSymbol->Address);
+      fprintf(fp, "%2d: [pc=0x%p]\n", i, reinterpret_cast<void*>(dwAddress));
     }
   }
 }