@@ -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)

@@ -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);

     }

@@ -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);

     }