Correctly reset archive_read_data state everytime a header is read.

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c
index 57923ce..b68b5a6 100644
--- a/lib/libarchive/archive_read.c
+++ b/lib/libarchive/archive_read.c
@@ -263,6 +263,8 @@ archive_read_next_header(struct archive *a, struct archive_entry **entryp)
 	}
 
 	*entryp = entry;
+	a->read_data_output_offset = 0;
+	a->read_data_remaining = 0;
 	return (ret);
 }
 
@@ -336,6 +338,9 @@ archive_read_header_position(struct archive *a)
  * buffer, filling any gaps with zero bytes.  Clients using this
  * API can be completely ignorant of sparse-file issues; sparse files
  * will simply be padded with nulls.
+ *
+ * DO NOT intermingle calls to this function and archive_read_data_block
+ * to read a single entry body.
  */
 ssize_t
 archive_read_data(struct archive *a, void *buff, size_t s)