summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2006-06-13 19:48:19 +0000
committerRoland McGrath <roland@redhat.com>2006-06-13 19:48:19 +0000
commitd8dcc9c17a866f18b342b3b0594c15d007b8b73b (patch)
tree3f6dce1ff7d27281d9f5787716602795f884f535
parent80808bfb539a216550fd4f3479267a24da397cd2 (diff)
downloadelfutils-d8dcc9c17a866f18b342b3b0594c15d007b8b73b.tar.gz
2006-06-13 Roland McGrath <roland@redhat.com>
* elf-from-memory.c (elf_from_remote_memory): Fix 32/64 typo. Use __libdwfl_seterrno for elf_memory failure.
-rw-r--r--libdwfl/ChangeLog5
-rw-r--r--libdwfl/elf-from-memory.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 1a49526d..96fe56bc 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-13 Roland McGrath <roland@redhat.com>
+
+ * elf-from-memory.c (elf_from_remote_memory): Fix 32/64 typo.
+ Use __libdwfl_seterrno for elf_memory failure.
+
2006-05-27 Ulrich Drepper <drepper@redhat.com>
* libdwfl.h: Add extern "C".
diff --git a/libdwfl/elf-from-memory.c b/libdwfl/elf-from-memory.c
index 90a0c4d8..2a174759 100644
--- a/libdwfl/elf-from-memory.c
+++ b/libdwfl/elf-from-memory.c
@@ -1,5 +1,5 @@
/* Reconstruct an ELF file by reading the segments out of remote memory.
- Copyright (C) 2005 Red Hat, Inc.
+ Copyright (C) 2005, 2006 Red Hat, Inc.
This file is part of Red Hat elfutils.
Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -338,7 +338,7 @@ elf_from_remote_memory (GElf_Addr ehdr_vma,
xlatefrom.d_size = xlateto.d_size = sizeof ehdr.e64;
xlatefrom.d_buf = &ehdr.e64;
xlateto.d_buf = buffer;
- if (elf32_xlatetof (&xlateto, &xlatefrom,
+ if (elf64_xlatetof (&xlateto, &xlatefrom,
ehdr.e64.e_ident[EI_DATA]) == NULL)
goto libelf_error;
break;
@@ -354,7 +354,7 @@ elf_from_remote_memory (GElf_Addr ehdr_vma,
if (elf == NULL)
{
free (buffer);
- return NULL;
+ goto libelf_error;
}
elf->flags |= ELF_F_MALLOCED;