commit 3d77a47483291cb9722dc8255c818bad5ad72f66
author Christopher Ferris <cferris@google.com> Thu Oct 22 00:04:58 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 22 00:04:58 2015 +0000
tree 77db90acecb20b5f9d3f4a6213da18966e008c75
parent 30b031c94b49a8d99d1bbf76e32ba4c3f186939c
parent 2d1a6f7913ba690595d40e487e9978e695db71d5

Fix copying of cached map data.
am: 2d1a6f7913

* commit '2d1a6f7913ba690595d40e487e9978e695db71d5':
  Fix copying of cached map data.

src/Los-common.c

diff --git a/src/Los-common.c b/src/Los-common.c
index 111caba..fd6ae3f 100644
--- a/src/Los-common.c
+++ b/src/Los-common.c
@@ -66,6 +66,9 @@
               /* No need to do any lock, the entire local_map_list is locked
                  at this point. */
               new_list->ei = old_list->ei;
+              /* Adjust the map pointer in the elf image data if necessary. */
+              if (!new_list->ei.mapped)
+                new_list->ei.u.memory.map = new_list;
               /* If it was mapped before, make sure to mark it unmapped now. */
               old_list->ei.mapped = false;
               /* Don't bother breaking out of the loop, the next while check