[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 4f3997d67ac42f812f09378c1f71cd38c72fa954
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Fri Mar 5 19:12:07 2010 +0100

    libclamav: fix cl_cvdparse() leak (bb#1859)

diff --git a/ChangeLog b/ChangeLog
index f447ca9..2d970da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Mar  5 19:11:25 CET 2010 (tk)
+---------------------------------
+ * libclamav: fix cl_cvdparse() leak (bb#1859)
+
 Thu Mar  4 17:33:18 CET 2010 (tk)
 ---------------------------------
  * libclamav/matcher-bm.c: fix array check (bb#1840)
diff --git a/libclamav/cvd.c b/libclamav/cvd.c
index 76b6af0..0de7aa8 100644
--- a/libclamav/cvd.c
+++ b/libclamav/cvd.c
@@ -617,7 +617,8 @@ int cli_cvdload(FILE *fs, struct cl_engine *engine, unsigned int *signo, unsigne
 	engine->dbinfo = dbinfo->next;
 	mpool_free(engine->mempool, dbinfo->name);
 	mpool_free(engine->mempool, dbinfo->hash);
-	free(dbinfo->cvd);
+	if(dbinfo->cvd)
+	    cl_cvdfree(dbinfo->cvd);
 	mpool_free(engine->mempool, dbinfo);
     }
 
diff --git a/libclamav/readdb.c b/libclamav/readdb.c
index fe495a1..d0d4ac3 100644
--- a/libclamav/readdb.c
+++ b/libclamav/readdb.c
@@ -2869,7 +2869,8 @@ int cl_engine_free(struct cl_engine *engine)
 	engine->dbinfo = pt->next;
 	mpool_free(engine->mempool, pt->name);
 	mpool_free(engine->mempool, pt->hash);
-	free(pt->cvd);
+	if(pt->cvd)
+	    cl_cvdfree(pt->cvd);
 	mpool_free(engine->mempool, pt);
     }
 

-- 
Debian repository for ClamAV