diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index fc089b0e2..649384386 100644
--- 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
diff --git a/clamav-devel/libclamav/scanners.c b/clamav-devel/libclamav/scanners.c
index aa939768c..b6975f481 100644
--- 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;