commit 5b80907273c027dfe2ff31f9191bf2d63a11be4d
author Christopher Ferris <cferris@google.com> Thu Mar 13 23:12:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 13 23:12:20 2014 +0000
tree 062ab1bb6639d1ca769d1ccf7a4a49cadd7631df
parent cca67c0bc49739510d8380a5b03603db784d5294
parent d24fdf6c51c7ab875662b9ca13372d57cd9f36e1

am d24fdf6c: Fix symbol name association.

* commit 'd24fdf6c51c7ab875662b9ca13372d57cd9f36e1':
  Fix symbol name association.

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);