commit 98b53a5d7a66867a60f5e21c2e3045960d024c47
author Christopher Ferris <cferris@google.com> Wed Jun 24 16:34:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 16:34:50 2015 +0000
tree bb4fd0fac38738ee842a3fd81bcdfc3527f6db83
parent 783e8dbb7eb31a0d3e8bfe4456c9321a7b33913f
parent 408bec05f3c7e7423c7086ca80f5e43234527ee8

am 408bec05: Skip stack and empty maps when reading load base.

* commit '408bec05f3c7e7423c7086ca80f5e43234527ee8':
  Skip stack and empty maps when reading load base.

src/os-linux.c

diff --git a/src/os-linux.c b/src/os-linux.c
index ed69813..f65c98a 100644
--- a/src/os-linux.c
+++ b/src/os-linux.c
@@ -73,8 +73,10 @@
           && strncmp ("ashmem/", cur_map->path + 5, 7) != 0)
         cur_map->flags |= MAP_FLAGS_DEVICE_MEM;
 
-      /* If this is a readable executable map, find the load_base. */
-      if ((flags & (PROT_EXEC | PROT_READ)) == (PROT_EXEC | PROT_READ)
+      /* If this is a readable executable map, and not a stack map or an
+         empty map, find the load_base.  */
+      if (cur_map->path[0] != '\0' && strncmp ("[stack:", cur_map->path, 7) != 0
+          && (flags & (PROT_EXEC | PROT_READ)) == (PROT_EXEC | PROT_READ)
           && !(cur_map->flags & MAP_FLAGS_DEVICE_MEM))
         {
           struct elf_image ei;