[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 00d70f6d9b14a97d25af4fd103e2659a5fda14d5
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:11 2008 +0100

    Revert "libclamav/ole2_extract.c, sigtool: make sigtool compatible with the new OLE2 scan scheme (bb#1086)"
    
    This reverts commit be62e2ee4046277229cfe184a907eabf48f1b081.

diff --git a/ChangeLog b/ChangeLog
index 48fd435..bdf2457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Mon Jul  7 15:41:02 CEST 2008 (tk)
-----------------------------------
-  * libclamav/ole2_extract.c, sigtool: make sigtool compatible with the new
-				       OLE2 scan scheme (bb#1086)
-
 Thu Jul  3 16:02:03 EEST 2008 (edwin)
 -------------------------------------
   * libclamav/scanners.c: add missing check for file open failure (bb #1083).
diff --git a/libclamav/ole2_extract.c b/libclamav/ole2_extract.c
index 859f314..ab64998 100644
--- a/libclamav/ole2_extract.c
+++ b/libclamav/ole2_extract.c
@@ -1050,8 +1050,7 @@ int cli_ole2_extract(int fd, const char *dirname, cli_ctx *ctx, struct uniq **vb
 	  cli_dbgmsg("OLE2: no VBA projects found\n");
 	  /* PASS 2/B : OTF scan */
 	  file_count = 0;
-	  if(ctx)
-	    ret = ole2_walk_property_tree(fd, &hdr, NULL, 0, handler_otf, 0, &file_count, ctx, &scansize2);
+	  ret = ole2_walk_property_tree(fd, &hdr, NULL, 0, handler_otf, 0, &file_count, ctx, &scansize2);
 	}
 
 abort:
diff --git a/sigtool/sigtool.c b/sigtool/sigtool.c
index 2896fce..5cd04f2 100644
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@@ -1178,7 +1178,7 @@ static int vbadump(struct optstruct *opt)
 	int fd, hex_output;
 	char *dir;
 	const char *pt;
-	struct uniq *vba = NULL;
+	struct uniq *vba;
 
 
     if(opt_check(opt, "vba-hex")) {
diff --git a/sigtool/vba.c b/sigtool/vba.c
index caedf99..9a45d96 100644
--- a/sigtool/vba.c
+++ b/sigtool/vba.c
@@ -983,7 +983,7 @@ static int sigtool_scandir (const char *dirname, int hex_output)
 			    }
 			} else {
 			    if (S_ISREG (statbuf.st_mode)) {
-			        struct uniq *vba = NULL;
+			        struct uniq *vba;
 				tmpdir = getenv ("TMPDIR");
 
 				if (tmpdir == NULL)
@@ -1012,8 +1012,7 @@ static int sigtool_scandir (const char *dirname, int hex_output)
 				    return ret;
 				}
 
-				if(vba)
-				    sigtool_vba_scandir (dir, hex_output, vba);
+				sigtool_vba_scandir (dir, hex_output, vba);
 
 				cli_rmdirs (dir);
 				free (dir);

-- 
Debian repository for ClamAV