From: Roland McGrath <roland@hack.frob.com>
Date: Sun, 6 Nov 2011 03:58:14 +0000 (-0700)
Subject: ar: Fix a return value check.
X-Git-Tag: elfutils-0.153~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fa988e13d09465b8ae4f605333fabf39d50fd30;p=thirdparty%2Felfutils.git

ar: Fix a return value check.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2334693c9..d777ca1a1 100644
--- 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 bfb324c71..37d56b647 100644
--- 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));