diff options
author | Mike Dodd <mdodd@google.com> | 2010-07-16 16:47:37 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-16 16:47:37 -0700 |
commit | 7fdcc435b67ddc82e4bfb68067b8bb96f34ebf77 (patch) | |
tree | 16ccec5f8d92fc191c1fadb1439cbc1f20b99872 /debuggerd | |
parent | 742150c031756da1393bf4223b2468b17cb79326 (diff) | |
parent | 891180320f0b08758d053a8562dfcd601ef846b0 (diff) | |
download | system_core-7fdcc435b67ddc82e4bfb68067b8bb96f34ebf77.tar.gz system_core-7fdcc435b67ddc82e4bfb68067b8bb96f34ebf77.tar.bz2 system_core-7fdcc435b67ddc82e4bfb68067b8bb96f34ebf77.zip |
am 89118032: Merge "Fix bug in debuggerd so it can successfully find the exidx section in libraries. This should fix the bug where the exception stack wasn\'t being printed past the PC." into gingerbread
Merge commit '891180320f0b08758d053a8562dfcd601ef846b0' into gingerbread-plus-aosp
* commit '891180320f0b08758d053a8562dfcd601ef846b0':
Fix bug in debuggerd so it can successfully find the exidx section in
Diffstat (limited to 'debuggerd')
-rw-r--r-- | debuggerd/debuggerd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debuggerd/debuggerd.c b/debuggerd/debuggerd.c index 3b2972ac..24b7e728 100644 --- a/debuggerd/debuggerd.c +++ b/debuggerd/debuggerd.c @@ -375,7 +375,7 @@ static void parse_elf_info(mapinfo *milist, pid_t pid) ptr = (Elf32_Phdr *) (mi->start + ehdr.e_phoff); for (i = 0; i < ehdr.e_phnum; i++) { /* Parse the program header */ - get_remote_struct(pid, (char *) ptr+i, &phdr, + get_remote_struct(pid, (char *) (ptr+i), &phdr, sizeof(Elf32_Phdr)); /* Found a EXIDX segment? */ if (phdr.p_type == PT_ARM_EXIDX) { |