diff options
author | Christopher Ferris <cferris@google.com> | 2016-05-12 15:46:01 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-12 15:46:01 +0000 |
commit | d35224ff189bf5fed77bfcc36c790c8dd205d0e0 (patch) | |
tree | c5ec20857cf6c2fd47fc3bf7a66058e97be418f6 | |
parent | 292f21f07f817e0b228930088f653226f67c7131 (diff) | |
parent | c3290dfdd3ef01a52a544b0ee7e37663befb6a3b (diff) | |
download | libunwind-nougat-mr1.7-release.tar.gz |
Use zero offset when getting bias from memory.android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-release
am: c3290dfdd3
* commit 'c3290dfdd3ef01a52a544b0ee7e37663befb6a3b':
Use zero offset when getting bias from memory.
Change-Id: Ie19a6439faa0de496ed29d23e1f6a76e42282ede
-rw-r--r-- | src/elfxx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/elfxx.c b/src/elfxx.c index 7fda0b72..057a3baf 100644 --- a/src/elfxx.c +++ b/src/elfxx.c @@ -635,7 +635,11 @@ HIDDEN bool elf_w (get_load_base) (struct elf_image* ei, unw_word_t mapoff, unw_ Elf_W(Phdr) phdr; GET_PHDR_FIELD(ei, offset, &phdr, p_type); GET_PHDR_FIELD(ei, offset, &phdr, p_offset); - if (phdr.p_type == PT_LOAD && phdr.p_offset == mapoff) { + // Always use zero as the map offset for in memory maps. + // The dlopen of a shared library from an APK will result in a + // non-zero map offset which would mean we would never find the + // correct program header using the passed in map offset. + if (phdr.p_type == PT_LOAD && phdr.p_offset == 0) { GET_PHDR_FIELD(ei, offset, &phdr, p_vaddr); *load_base = phdr.p_vaddr; return true; |