diff options
author | kientzle <kientzle@FreeBSD.org> | 2009-03-07 01:17:13 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2009-03-07 01:17:13 +0000 |
commit | 7ab17b860dfae3d5f20a0f77ef519960d8bf1649 (patch) | |
tree | bf7133ab4e330af518fc5bfe6a599ebc28372bce /lib | |
parent | 3fb549959da27bfe05e05642921a951f3af481a6 (diff) | |
download | FreeBSD-src-7ab17b860dfae3d5f20a0f77ef519960d8bf1649.zip FreeBSD-src-7ab17b860dfae3d5f20a0f77ef519960d8bf1649.tar.gz |
Merge r564,r566 from libarchive.googlecode.com: Fix segfault when
specifying an option and the current format doesn't have an
options handler.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libarchive/archive_read.c | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c index 0cd8054..240986a 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); - - 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; + 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, 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; |