libclamav/ole2_extract.c, sigtool: make sigtool compatible with the new OLE2 scan scheme (bb#1086)

git-svn: trunk@3915

ChangeLog

@@ -1,3 +1,8 @@
+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)
+
 Fri Jul  4 18:04:40 CEST 2008 (tk)
 ----------------------------------
   * configure, clamd: fix compilation error on systems without

libclamav/ole2_extract.c

@@ -1063,7 +1063,8 @@ 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;
-	  ret = ole2_walk_property_tree(fd, &hdr, NULL, 0, handler_otf, 0, &file_count, ctx, &scansize2);
+	  if(ctx)
+	    ret = ole2_walk_property_tree(fd, &hdr, NULL, 0, handler_otf, 0, &file_count, ctx, &scansize2);
 	}
 
 abort:

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;
+	struct uniq *vba = NULL;
 
 
     if(opt_check(opt, "vba-hex")) {

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;
+			        struct uniq *vba = NULL;
 				tmpdir = getenv ("TMPDIR");
 
 				if (tmpdir == NULL)
@@ -1012,7 +1012,8 @@ static int sigtool_scandir (const char *dirname, int hex_output)
 				    return ret;
 				}
 
-				sigtool_vba_scandir (dir, hex_output, vba);
+				if(vba)
+				    sigtool_vba_scandir (dir, hex_output, vba);
 
 				cli_rmdirs (dir);
 				free (dir);