From 585afbbc6a833e91cd2e51b8faeece2248c0cc16 Mon Sep 17 00:00:00 2001
From: kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 21 Dec 2012 17:21:12 +0000
Subject: * vm_dump.c (rb_vm_bugreport): revert r38533. * addr2line.c
 (fill_lines): add ELF sanity check.   [Bug #7597] [ruby-dev:46786]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 addr2line.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'addr2line.c')

diff --git a/addr2line.c b/addr2line.c
index e102abba4f..04a48e751d 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -493,6 +493,16 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
 	return;
     }
 
+    ehdr = (ElfW(Ehdr) *)file;
+    if (memcmp(ehdr->e_ident, "\177ELF", 4) != 0) {
+	/*
+	 * Huh? Maybe filename was overridden by setproctitle() and
+	 * it match non-elf file.
+	 */
+	close(fd);
+	return;
+    }
+
     current_line->fd = fd;
     current_line->mapped = file;
     current_line->mapped_size = (size_t)filesize;
@@ -506,7 +516,6 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
 	}
     }
 
-    ehdr = (ElfW(Ehdr) *)file;
     shdr = (ElfW(Shdr) *)(file + ehdr->e_shoff);
 
     shstr_shdr = shdr + ehdr->e_shstrndx;
-- 
cgit v1.2.3