From 98768f0df8e7d96bc82d365e0536bc8e3d0a7e0d Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sat, 7 Mar 2009 01:17:13 +0000
Subject: [PATCH] Merge r564,r566 from libarchive.googlecode.com:  Fix segfault
 when specifying an option and the current format doesn't have an options
 handler.

---
 lib/libarchive/archive_read.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c
index 0cd805404fb6..240986acf206 100644
--- a/lib/libarchive/archive_read.c
+++ b/lib/libarchive/archive_read.c
@@ -115,24 +115,30 @@ int
 archive_read_set_format_options(struct archive *_a, const char *s)
 {
 	struct archive_read *a;
+	struct archive_format_descriptor *format;
 	char key[64], val[64];
+	size_t i;
 	int len, r;
 
 	a = (struct archive_read *)_a;
-	if (a->format == NULL || a->format->options == NULL ||
-	    a->format->name == NULL)
-		/* This format does not support option. */
-		return (ARCHIVE_OK);
+	len = 0;
+	for (i = 0; i < sizeof(a->formats)/sizeof(a->formats[0]); i++) {
+		format = &a->formats[i];
+		if (format == NULL || format->options == NULL ||
+		    format->name == NULL)
+			/* This format does not support option. */
+			continue;
 
-	while ((len = __archive_parse_options(s, a->format->name,
-	    sizeof(key), key, sizeof(val), val)) > 0) {
-		if (val[0] == '\0')
-			r = a->format->options(a, key, NULL);
-		else
-			r = a->format->options(a, key, val);
-		if (r == ARCHIVE_FATAL)
-			return (r);
-		s += len;
+		while ((len = __archive_parse_options(s, format->name,
+		    sizeof(key), key, sizeof(val), val)) > 0) {
+			if (val[0] == '\0')
+				r = format->options(a, key, NULL);
+			else
+				r = format->options(a, key, val);
+			if (r == ARCHIVE_FATAL)
+				return (r);
+			s += len;
+		}
 	}
 	if (len < 0) {
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
@@ -159,6 +165,8 @@ archive_read_set_filter_options(struct archive *_a, const char *s)
 	len = 0;
 	for (filter = a->filter; filter != NULL; filter = filter->upstream) {
 		bidder = filter->bidder;
+		if (bidder == NULL)
+			continue;
 		if (bidder->options == NULL)
 			/* This bidder does not support option */
 			continue;