bb#1909

15 years ago · 4531ba07e1
parent 7f0e3bbf77
commit 4531ba07e1
2 changed files with 6 additions and 1 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+Wed May 19 12:21:02 CEST 2010 (acab)
+------------------------------------
+ * libclamav/7z/Archive/7z/7zIn.c: fix possible(?) null dereference reported
+		 		by clang (bb#1909)
+
 Wed May 19 12:19:27 CEST 2010 (acab)
 ------------------------------------
 * libclamav/pe_icons.c: properly round down when scaling (bb#2031)
--- a/libclamav/7z/Archive/7z/7zIn.c
+++ b/libclamav/7z/Archive/7z/7zIn.c
@ -647,7 +647,7 @@ static SRes SzReadSubStreamsInfo(
    RINOM(*digests);
  }

-  for (i = 0; i < numFolders; i++)
+  for (i = 0; i < numFolders && *unpackSizes; i++)
  {
    /*
    v3.13 incorrectly worked with empty folders