fix NULL pointer dereference in metadata scanner

git-svn: trunk@1357
21 years ago · 1de1c2b8fd
parent 1d05987b09
commit 1de1c2b8fd
2 changed files with 6 additions and 1 deletions
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@ -1,3 +1,8 @@
+Thu Feb 24 18:37:45 CET 2005 (tk)
+---------------------------------
+  * libclamav/scanners.c: fix NULL pointer dereference in metadata scanner
+			  (thanks to Nigel)	
+
 Wed Feb 23 09:42:52 GMT 2005 (njh)
 ----------------------------------
  * clamav-milter:	Remove the pid file on exit
--- a/clamav-devel/libclamav/scanners.c
+++ b/clamav-devel/libclamav/scanners.c
@ -345,7 +345,7 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

 	/* Scan metadata */
 	mdata = root->zip_mlist;
-	do {
+	if(mdata) do {
 	    if(mdata->encrypted != encrypted)
 		continue;