@@ -1,3 +1,8 @@

+Fri Dec 17 14:21:21 CET 2010 (acab)

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

+ * clamav-milter/whitelist.c, clamscan/manager.c, libclamav/sis.c:

+   error path leaks and similar - thanks Michael Tautschnig <mt*debian.org>

+	

 Thu Dec 16 15:31:38 CET 2010 (acab)

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

  * clamav-milter: handle EINTR during waitpid()

@@ -90,6 +90,7 @@ int whitelist_init(const char *fname) {

 	if (!(w = (struct WHLST *)malloc(sizeof(*w)))) {

 	    logg("!Out of memory loading whitelist file\n");

 	    whitelist_free();

+	    fclose(f);

 	    return 1;

 	}

 	w->next = (*addto);

@@ -97,9 +98,11 @@ int whitelist_init(const char *fname) {

 	if (cli_regcomp(&w->preg, ptr, REG_ICASE|REG_NOSUB)) {

 	    logg("!Failed to compile regex '%s' in whitelist file\n", ptr);

 	    whitelist_free();

+	    fclose(f);

 	    return 1;

 	}

     }

+    fclose(f);

     return 0;

 }

@@ -273,6 +273,7 @@ static int scanstdin(const struct cl_engine *engine, const struct optstruct *opt

 	if(fwrite(buff, 1, bread, fs) < bread) {

 	    logg("!Can't write to %s\n", file);

 	    free(file);

+	    fclose(fs);

 	    return 2;

 	}

     }

@@ -506,7 +506,6 @@ static int real_scansis(FILE *f, cli_ctx *ctx, const char *tmpd) {

 	    free(decomp);

 	    free(ptrs);

 	    free(alangs);

-	    close(fd);

 	    return CL_EWRITE;

 	  }

 	  free(decomp);