@@ -1,3 +1,7 @@

+Wed May 19 00:03:19 CEST 2010 (tk)

+----------------------------------

+ * libclamav/readdb.c: properly reject .info files passed on cmdline (bb#2025)

+

 Tue May 18 23:35:43 CEST 2010 (tk)

 ----------------------------------

  * libclamav/matcher-bm.c: fix offset check (bb#2032)

@@ -1620,6 +1620,11 @@ static int cli_loadinfo(FILE *fs, struct cl_engine *engine, unsigned int options

 	int ret = CL_SUCCESS, dsig = 0;

 	SHA256_CTX ctx;

+

+    if(!dbio) {

+	cli_errmsg("cli_loadinfo: .info files can only be loaded from within database container files\n");

+	return CL_EMALFDB;

+    }

     sha256_init(&ctx);

     while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {

 	line++;