Merge r2028 from trunk to fix Issue 76.

SVN-Revision: 2029

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index 5a85e71125a11101c0cb23628d9fd60b894fb7e6..207915708343c1aa95bb5e6d9cfe6b53e4f76248 100644 (file)
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -210,7 +210,7 @@ archive_read_format_zip_bid(struct archive_read *a)
                        /* Get 4k of data beyond where we stopped. */
                        buff = __archive_read_ahead(a, offset + 4096,
                            &bytes_avail);
-                       if (bytes_avail < offset + 1)
+                       if (buff == NULL)
                                break;
                        p = (const char *)buff + offset;
                        while (p + 9 < (const char *)buff + bytes_avail) {