Author: emaste
Date: Wed Jan  7 01:51:02 2015
New Revision: 276774
URL: https://svnweb.freebsd.org/changeset/base/276774

Log:
  ar: Avoid null pointer deref while reading corrupt archives
  
  ELF Tool Chain ticket #467
  
  Reported by:  Alexander Cherepanov <chere...@mccme.ru>
  MFC after:    1 week
  Sponsored by: The FreeBSD Foundation

Modified:
  head/usr.bin/ar/read.c

Modified: head/usr.bin/ar/read.c
==============================================================================
--- head/usr.bin/ar/read.c      Wed Jan  7 01:41:45 2015        (r276773)
+++ head/usr.bin/ar/read.c      Wed Jan  7 01:51:02 2015        (r276774)
@@ -102,7 +102,8 @@ read_archive(struct bsdar *bsdar, char m
                        continue;
                }
 
-               name = archive_entry_pathname(entry);
+               if ((name = archive_entry_pathname(entry)) == NULL)
+                       break;
 
                /* Skip pseudo members. */
                if (strcmp(name, "/") == 0 || strcmp(name, "//") == 0)
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to