]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Avoid a double-free when a window size of 0 is specified
authorDaniel Axtens <dja@axtens.net>
Tue, 20 Nov 2018 06:56:29 +0000 (17:56 +1100)
committerDaniel Axtens <dja@axtens.net>
Tue, 11 Dec 2018 02:58:11 +0000 (13:58 +1100)
new_size can be 0 with a malicious or corrupted RAR archive.

realloc(area, 0) is equivalent to free(area), so the region would
be free()d here and the free()d again in the cleanup function.

Found with a setup running AFL, afl-rb, and qsym.

libarchive/archive_read_support_format_rar.c

index 234522229e4094b761597e7294e363dc4817c825..6f419c2708c4312cf8e68ed87397fc58ef4832f6 100644 (file)
@@ -2300,6 +2300,11 @@ parse_codes(struct archive_read *a)
       new_size = DICTIONARY_MAX_SIZE;
     else
       new_size = rar_fls((unsigned int)rar->unp_size) << 1;
+    if (new_size == 0) {
+      archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+                        "Zero window size is invalid.");
+      return (ARCHIVE_FATAL);
+    }
     new_window = realloc(rar->lzss.window, new_size);
     if (new_window == NULL) {
       archive_set_error(&a->archive, ENOMEM,