From 0895f35cb3f72fc68b820d06ed33b2f22bb44981 Mon Sep 17 00:00:00 2001 From: emaste Date: Thu, 21 May 2015 13:30:10 +0000 Subject: MFC r276774: ar: Avoid null pointer deref while reading corrupt archives ELF Tool Chain ticket #467 Reported by: Alexander Cherepanov Sponsored by: The FreeBSD Foundation --- usr.bin/ar/read.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/ar/read.c b/usr.bin/ar/read.c index 98674b7..aa499e0 100644 --- a/usr.bin/ar/read.c +++ b/usr.bin/ar/read.c @@ -102,7 +102,8 @@ read_archive(struct bsdar *bsdar, char mode) continue; } - name = archive_entry_pathname(entry); + if ((name = archive_entry_pathname(entry)) == NULL) + break; /* Skip pseudo members. */ if (strcmp(name, "/") == 0 || strcmp(name, "//") == 0) -- cgit v1.1