Zip: prevent possible nullpointer dereference when parsing directory …

…entries
selmf · May 1, 2022 · 02129fe · 02129fe
1 parent 22dbd92
commit 02129fe
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/zip/zip.c b/zip/zip.c
@@ -55,7 +55,9 @@ static bool zip_parse_local_entry(ar_archive *ar, off64_t offset)
     zip->progress.data_left = (size_t)entry.datasize;
     zip_clear_uncompress(&zip->uncomp);
 
-    if (entry.datasize == 0 && ar_entry_get_name(ar) && *zip->entry.name && zip->entry.name[strlen(zip->entry.name) - 1] == '/') {
+    if (entry.datasize == 0 && ar_entry_get_name(ar) &&
+          zip->entry.name != NULL && *zip->entry.name &&
+          zip->entry.name[strlen(zip->entry.name) - 1] == '/') {
         log("Skipping directory entry \"%s\"", zip->entry.name);
         return zip_parse_local_entry(ar, ar->entry_offset_next);
     }