24 lines
979 B
Diff
24 lines
979 B
Diff
From 98dcbbf0bf4854bf987557e55e55fff7abbf3ea9 Mon Sep 17 00:00:00 2001
|
|
From: Martin Matuska <martin@matuska.org>
|
|
Date: Thu, 19 Jan 2017 22:00:18 +0100
|
|
Subject: [PATCH] Fail with negative lha->compsize in lha_read_file_header_1()
|
|
Fixes a heap buffer overflow reported in Secunia SA74169
|
|
|
|
---
|
|
libarchive/archive_read_support_format_lha.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
|
|
index 52a5531..d77a7c2 100644
|
|
--- a/libarchive/archive_read_support_format_lha.c
|
|
+++ b/libarchive/archive_read_support_format_lha.c
|
|
@@ -924,6 +924,9 @@ lha_read_file_header_1(struct archive_read *a, struct lha *lha)
|
|
/* Get a real compressed file size. */
|
|
lha->compsize -= extdsize - 2;
|
|
|
|
+ if (lha->compsize < 0)
|
|
+ goto invalid; /* Invalid compressed file size */
|
|
+
|
|
if (sum_calculated != headersum) {
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
"LHa header sum error");
|