Browse code

fix initialization of dbio

git-svn: trunk@3855

Tomasz Kojm authored on 2008/05/20 01:35:53
Showing 2 changed files
... ...
@@ -1,3 +1,7 @@
1
+Mon May 19 17:44:32 CEST 2008 (tk)
2
+----------------------------------
3
+  * libclamav/cvd.c: fix initialization of dbio
4
+
1 5
 Sun May 18 22:39:00 CEST 2008 (tk)
2 6
 ----------------------------------
3 7
   * libclamav: faster loading of uncompressed .cld files
... ...
@@ -214,11 +214,13 @@ static int cli_tgzload(int fd, struct cl_engine **engine, unsigned int *signo, u
214 214
 	    cli_errmsg("cli_tgzload: Can't gzdopen() descriptor %d, errno = %d\n", fdd, errno);
215 215
 	    return CL_EIO;
216 216
 	}
217
+	dbio.fs = NULL;
217 218
     } else {
218 219
 	if((dbio.fs = fdopen(fdd, "rb")) == NULL) {
219 220
 	    cli_errmsg("cli_tgzload: Can't fdopen() descriptor %d, errno = %d\n", fdd, errno);
220 221
 	    return CL_EIO;
221 222
 	}
223
+	dbio.gzs = NULL;
222 224
     }
223 225
 
224 226
     while(1) {
... ...
@@ -284,7 +286,7 @@ static int cli_tgzload(int fd, struct cl_engine **engine, unsigned int *signo, u
284 284
 	if(CLI_DBEXT(name)) {
285 285
 	    ret = cli_load(name, engine, signo, options, &dbio);
286 286
 	    if(ret) {
287
-		cli_errmsg("cli_tgzload: Invalid size in header\n");
287
+		cli_errmsg("cli_tgzload: Can't load %s\n", name);
288 288
 		CLOSE_DBIO;
289 289
 		return CL_EMALFDB;
290 290
 	    }