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

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit e94bd376e856011905a9b7e75ce8ef8d45f020dd
Author: aCaB <acab at clamav.net>
Date:   Thu Oct 29 22:59:11 2009 +0100

    win32: fix fail-path double free in glob

diff --git a/win32/compat/setargv.c b/win32/compat/setargv.c
index 00d3821..3d8cd87 100644
--- a/win32/compat/setargv.c
+++ b/win32/compat/setargv.c
@@ -91,7 +91,15 @@ int _setargv() {
 
 		memcpy(path, begparm, endparm - begparm);
 		path[endparm - begparm] = '\0';
-		if(!argc || !need_glob || !(arglen = glob_add(path, &argc, &argv))) {
+		if(argc && need_glob) {
+		    arglen = glob_add(path, &argc, &argv);
+		    if(!arglen) {
+			*path = malloc(endparm - begparm + 1);
+			memcpy(path, begparm, endparm - begparm);
+			path[endparm - begparm] = '\0';
+		    }
+		}
+		if(!arglen) {
 		    argv = realloc(argv, sizeof(*argv) * (argc + 1));
 		    argv[argc] = path;
 		    argc++;

-- 
Debian repository for ClamAV