From 0da7a22640cb13e239debde30312274ad592d5f5 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sun, 12 Apr 2009 04:45:40 +0000 Subject: Merge r881 from libarchive.googlecode.com: The "empty" format should not be recognized if there is a read error. --- lib/libarchive/archive_read_support_format_empty.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/libarchive/archive_read_support_format_empty.c') diff --git a/lib/libarchive/archive_read_support_format_empty.c b/lib/libarchive/archive_read_support_format_empty.c index bdecd6548854a..38498cf7ff3dd 100644 --- a/lib/libarchive/archive_read_support_format_empty.c +++ b/lib/libarchive/archive_read_support_format_empty.c @@ -60,9 +60,10 @@ static int archive_read_format_empty_bid(struct archive_read *a) { const void *h; + ssize_t avail; - h = __archive_read_ahead(a, 1, NULL); - if (h != NULL) + h = __archive_read_ahead(a, 1, &avail); + if (avail != 0) return (-1); return (1); } -- cgit v1.3