From 992d06810af1969735b140830860f5b6e630fc29 Mon Sep 17 00:00:00 2001
From: Mike McLaughlin <mikem@microsoft.com>
Date: Tue, 12 Sep 2017 12:41:14 -0700
Subject: [PATCH] Fix core dump generation on Centos. (#13887)

Fix core dump generation on Centos.

Issue #13764
---
 src/debug/createdump/crashinfo.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/debug/createdump/crashinfo.cpp b/src/debug/createdump/crashinfo.cpp
index b8f9294..ae3e70f 100644
--- a/src/debug/createdump/crashinfo.cpp
+++ b/src/debug/createdump/crashinfo.cpp
@@ -517,13 +517,13 @@ CrashInfo::GetDSOInfo()
 bool
 CrashInfo::GetELFInfo(uint64_t baseAddress)
 {
-    if (baseAddress == 0) {
+    if (baseAddress == 0 || baseAddress == m_auxvValues[AT_SYSINFO_EHDR] || baseAddress == m_auxvValues[AT_BASE]) {
         return true;
     }
     Ehdr ehdr;
     if (!ReadMemory((void*)baseAddress, &ehdr, sizeof(ehdr))) {
-        fprintf(stderr, "ReadMemory(%p, %" PRIx ") ehdr FAILED\n", (void*)baseAddress, sizeof(ehdr));
-        return false;
+        TRACE("ReadMemory(%p, %" PRIx ") ehdr FAILED\n", (void*)baseAddress, sizeof(ehdr));
+        return true;
     }
     int phnum = ehdr.e_phnum;
     assert(phnum != PN_XNUM);
-- 
2.7.4