Misc createdump fixes (dotnet#49038)

* Misc createdump fixes * Fixed issue dotnet#42589 * Code review feedback
shadow-cs · Mar 4, 2021 · c641d97 · c641d97
1 parent ba8ce9e
commit c641d97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/coreclr/debug/createdump/crashinfounix.cpp b/src/coreclr/debug/createdump/crashinfounix.cpp
@@ -262,7 +262,7 @@ CrashInfo::GetDSOInfo()
 void
 CrashInfo::VisitModule(uint64_t baseAddress, std::string& moduleName)
 {
-    if (baseAddress == 0 || baseAddress == m_auxvValues[AT_SYSINFO_EHDR] || baseAddress == m_auxvValues[AT_BASE]) {
+    if (baseAddress == 0 || baseAddress == m_auxvValues[AT_SYSINFO_EHDR]) {
         return;
     }
     if (m_coreclrPath.empty())

diff --git a/src/coreclr/debug/createdump/createdumpunix.cpp b/src/coreclr/debug/createdump/createdumpunix.cpp
@@ -45,6 +45,7 @@ CreateDump(const char* dumpPathTemplate, int pid, const char* dumpType, MINIDUMP
     }
     if (!dumpWriter.WriteDump())
     {
+        fprintf(stderr, "Writing dump FAILED\n");
         goto exit;
     }
     result = true;

diff --git a/src/coreclr/debug/createdump/dumpwriter.cpp b/src/coreclr/debug/createdump/dumpwriter.cpp
@@ -219,8 +219,8 @@ DumpWriter::WriteDump()
 
                 // This can happen if the target process dies before createdump is finished
                 if (read == 0) {
-                    TRACE("ReadProcessMemory(%" PRIA PRIx64 ", %08x) return 0 bytes read\n", address, bytesToRead);
-                    break;
+                    fprintf(stderr, "ReadProcessMemory(%" PRIA PRIx64 ", %08x) returned 0 bytes read\n", address, bytesToRead);
+                    return false;
                 }
 
                 if (!WriteData(m_tempBuffer, read)) {