diff options
author | Roland McGrath <roland@hack.frob.com> | 2011-11-05 20:58:14 -0700 |
---|---|---|
committer | Roland McGrath <roland@hack.frob.com> | 2011-11-05 20:58:14 -0700 |
commit | 4fa988e13d09465b8ae4f605333fabf39d50fd30 (patch) | |
tree | 428f3e9df05fe74805c507c70a1debf80356e0f1 | |
parent | ef431cd30b8a1a6b12a8783516fc95da88a9a636 (diff) |
ar: Fix a return value check.
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/ar.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2334693c..d777ca1a 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. @@ -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)); |