commit d24fdf6c51c7ab875662b9ca13372d57cd9f36e1
author Christopher Ferris <cferris@google.com> Wed Mar 12 23:45:49 2014 -0700
committer Christopher Ferris <cferris@google.com> Thu Mar 13 09:49:58 2014 -0700
tree 062ab1bb6639d1ca769d1ccf7a4a49cadd7631df
parent faaccf4cea2788853f4401943b68266e0524a564

Fix symbol name association.

Do not associate a name with an ip unless the ip is actually within
the symbol's size.

Change-Id: I7ec424abdd9a21ca94b37fa30302b355b64b6312

src/elfxx.c

diff --git a/src/elfxx.c b/src/elfxx.c
index 78112cd..38d69fc 100644
--- a/src/elfxx.c
+++ b/src/elfxx.c
@@ -135,7 +135,10 @@
 		  Debug (16, "0x%016lx info=0x%02x %s\n",
 			 (long) val, sym->st_info, strtab + sym->st_name);
 
-		  if ((Elf_W (Addr)) (ip - val) < *min_dist)
+                  /* ANDROID support update */
+                  if ((Elf_W (Addr)) (ip - val) < *min_dist
+                      && (Elf_W (Addr)) (ip - val) < sym->st_size)
+                  /* End of ANDROID update */
 		    {
 		      *min_dist = (Elf_W (Addr)) (ip - val);
 		      strncpy (buf, strtab + sym->st_name, buf_len);