summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-21 14:52:24 +0100
committerDan McGee <dan@archlinux.org>2011-03-21 14:52:24 +0100
commit834ba4da932f9e196e06baf724e0bd379092ded5 (patch)
tree31fde1b33d8f0c6eb94045b26aab414003696d4c
parentb0bb4f9024712adcee5e2baf6cebe73c966d7d7f (diff)
downloadpacman-834ba4da932f9e196e06baf724e0bd379092ded5.tar.gz
pacman-834ba4da932f9e196e06baf724e0bd379092ded5.tar.xz
Fix line_offset not being reset in _alpm_archive_fgets()
This is a rather serious data corruption issue that luckily manifested itself today in a noticable way. A package in testing had replaces entries read in as ["%RE pkgname", "%RE"] which was clearly wrong. This happens when we hit the end of an archive block, do not have a newline, and have to continue reading from the next block to complete the line. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/util.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 74e14058..11e69041 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -740,6 +740,9 @@ int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b)
int64_t offset;
int done = 0;
+ /* ensure we start populating our line buffer at the beginning */
+ b->line_offset = b->line;
+
while(1) {
/* have we processed this entire block? */
if(b->block + b->block_size == b->block_offset) {