summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Dodd <mdodd@google.com>2010-07-16 16:49:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-16 16:49:46 -0700
commitd5c4d2ae3af12f13f1d6700b395fcac13143d01c (patch)
tree26541011d08a05d4b16042769241e3ea69c208bf
parentf13c2ba5f85f6cd5499f90978b635724856b7eb3 (diff)
parent7fdcc435b67ddc82e4bfb68067b8bb96f34ebf77 (diff)
downloadsystem_core-d5c4d2ae3af12f13f1d6700b395fcac13143d01c.zip
system_core-d5c4d2ae3af12f13f1d6700b395fcac13143d01c.tar.gz
system_core-d5c4d2ae3af12f13f1d6700b395fcac13143d01c.tar.bz2
am 7fdcc435: 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 '7fdcc435b67ddc82e4bfb68067b8bb96f34ebf77' * commit '7fdcc435b67ddc82e4bfb68067b8bb96f34ebf77': Fix bug in debuggerd so it can successfully find the exidx section in
-rw-r--r--debuggerd/debuggerd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/debuggerd/debuggerd.c b/debuggerd/debuggerd.c
index 3b2972a..24b7e72 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) {