commit d04672513351af4eb302692e0f39fd5bd17191cb
author The Android Open Source Project <initial-contribution@android.com> Wed Mar 31 14:19:51 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Mar 31 14:19:51 2010 -0700
tree 0ea1cef08bcfedafa705e3374863d51ec69080e1
parent 5ffedb22c856ae5731324b43832ab3f5309683f2
parent 4ad72f89b12fe0157074a253190f6aa2cbfe15ac

merge from open-source master

Change-Id: I483fedf77d978b1c6e52d73eebc14f011bb9f809

linker/linker.c

diff --git a/linker/linker.c b/linker/linker.c
index 5cc05e2..6719b12 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -469,7 +469,7 @@
             DEBUG("%5d %s: looking up %s in %s\n",
                   pid, si->name, name, lsi->name);
             s = _elf_lookup(lsi, elf_hash, name);
-            if(s != NULL)
+            if ((s != NULL) && (s->st_shndx != SHN_UNDEF))
                 goto done;
         }
     }