From: cielavenir <cielartisan@gmail.com>
Date: Fri, 18 Feb 2022 15:23:16 +0000 (+0900)
Subject: code review
X-Git-Tag: v3.6.1~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1671%2Fhead;p=thirdparty%2Flibarchive.git

code review
---

diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c
index f15374f7a..d41209c97 100644
--- a/libarchive/archive_read_support_format_7zip.c
+++ b/libarchive/archive_read_support_format_7zip.c
@@ -988,7 +988,10 @@ ppmd_read(void *p)
 	Byte b;
 
 	if (zip->ppstream.avail_in <= 0) {
-		// Ppmd7_DecodeSymbol might require reading multiple bytes and we are on boundary; last resort to read using __archive_read_ahead.
+		/*
+                 * Ppmd7_DecodeSymbol might require reading multiple bytes and we are on boundary;
+                 * last resort to read using __archive_read_ahead.
+                 */
 		ssize_t bytes_avail = 0;
 		const uint8_t* data = __archive_read_ahead(a, zip->ppstream.stream_in+1, &bytes_avail);
 		if(bytes_avail < zip->ppstream.stream_in+1) {
@@ -999,15 +1002,12 @@ ppmd_read(void *p)
 		}
 		zip->ppstream.next_in++;
 		b = data[zip->ppstream.stream_in];
-		zip->ppstream.avail_in--;
-		zip->ppstream.total_in++;
-		zip->ppstream.stream_in++;
 	} else {
 		b = *zip->ppstream.next_in++;
-		zip->ppstream.avail_in--;
-		zip->ppstream.total_in++;
-		zip->ppstream.stream_in++;
 	}
+	zip->ppstream.avail_in--;
+	zip->ppstream.total_in++;
+	zip->ppstream.stream_in++;
 	return (b);
 }