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.

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 1a49526..96fe56b 100644 (file)
--- 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 90a0c4d..2a17475 100644 (file)
--- 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;