ar: Fix a return value check.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2334693c960fb851f50accd038c8857c8a6dcfb7..d777ca1a17f57a0840dce254fd7dcce526e59fe5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-05  Roland McGrath  <roland@hack.frob.com>
+
+       * ar.c (do_oper_insert): Fix check on elf_rawfile return value.
+
 2011-10-04  Marek Polacek  <mpolacek@redhat.com>
 
        * readelf.c (register_info): Assume the right size of an array.

diff --git a/src/ar.c b/src/ar.c
index bfb324c714aedfac9f64dd6173d5a48ee4518be6..37d56b647d0b25e1ed1f3c7137fa3dc0a5cab4f6 100644 (file)
--- a/src/ar.c
+++ b/src/ar.c
@@ -1302,7 +1302,8 @@ do_oper_insert (int oper, const char *arfname, char **argv, int argc,
              found[cnt]->name = bname;
 
              found[cnt]->mem = elf_rawfile (newelf, &found[cnt]->size);
-             if (found[cnt] == NULL || elf_cntl (newelf, ELF_C_FDDONE) != 0)
+             if (found[cnt]->mem == NULL
+                 || elf_cntl (newelf, ELF_C_FDDONE) != 0)
                error (EXIT_FAILURE, 0, gettext ("cannot read %s: %s"),
                       argv[cnt], elf_errmsg (-1));