ole2_extract: backport fixes from 0.93.1rc1

git-svn: trunk@3865

ChangeLog

@@ -1,3 +1,7 @@
+Tue May 27 21:43:04 CEST 2008 (acab)
+------------------------------------
+  * libclamav/ole2_extract.c: allow (partial) scan of broken ole files
+
 Tue May 27 17:39:06 CEST 2008
 -----------------------------
   * improve handling of PDF, CAB, RTF, OLE2 and HTML files (sync with

libclamav/ole2_extract.c

@@ -191,7 +191,7 @@ static char *get_property_name(char *name, int size) {
   char *newname, *cname;
   char *oname = name;
 
-	if (csize<=0) return NULL;
+  if (csize<=0) return NULL;
 
   newname = cname = (char *)cli_malloc(size);
   if (!newname) return NULL;
@@ -803,54 +803,22 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char
   while((current_block >= 0) && (len > 0)) {
     if (current_block > (int32_t) hdr->max_block_no) {
       cli_dbgmsg("OLE2: Max block number for file size exceeded: %d\n", current_block);
-      close(ofd);
-      free(buff);
-      cli_bitset_free(blk_bitset);
-      if (cli_unlink(tempfile)) {
-        free(tempfile);
-	return CL_EIO;
-      }
-      free(tempfile);
-      return CL_SUCCESS;
+      break;
     }
     /* Check we aren't in a loop */
     if (cli_bitset_test(blk_bitset, (unsigned long) current_block)) {
       /* Loop in block list */
       cli_dbgmsg("OLE2: Block list loop detected\n");
-      close(ofd);
-      free(buff);
-      cli_bitset_free(blk_bitset);
-      if (cli_unlink(tempfile)) {
-        free(tempfile);
-	return CL_EIO;
-      }
-      free(tempfile);
-      return CL_BREAK;
+      break;
     }
     if (!cli_bitset_set(blk_bitset, (unsigned long) current_block)) {
-      close(ofd);
-      free(buff);
-      cli_bitset_free(blk_bitset);
-      if (cli_unlink(tempfile)) {
-        free(tempfile);
-	return CL_EIO;
-      }
-      free(tempfile);
-      return CL_BREAK;
+      break;
     }			
     if (prop->size < (int64_t)hdr->sbat_cutoff) {
       /* Small block file */
       if (!ole2_get_sbat_data_block(fd, hdr, buff, current_block)) {
 	cli_dbgmsg("ole2_get_sbat_data_block failed\n");
-	close(ofd);
-	free(buff);
-	cli_bitset_free(blk_bitset);
-	if (cli_unlink(tempfile)) {
-	  free(tempfile);
-	  return CL_EIO;
-        }
-	free(tempfile);
-	return CL_SUCCESS;
+	break;
       }
       /* buff now contains the block with 8 small blocks in it */
       offset = 64 * (current_block % 8);
@@ -871,15 +839,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char
     } else {
       /* Big block file */
       if (!ole2_read_block(fd, hdr, buff, current_block)) {
-	close(ofd);
-	free(buff);
-	cli_bitset_free(blk_bitset);
-	if (cli_unlink(tempfile)) {
-	  free(tempfile);
-	  return CL_EIO;
-        }
-	free(tempfile);
-	return CL_SUCCESS;
+	break;
       }
       if (cli_writen(ofd, buff, MIN(len,(1 << hdr->log2_big_block_size))) !=
 	  MIN(len,(1 << hdr->log2_big_block_size))) {
@@ -891,7 +851,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char
 	  return CL_EIO;
         }
 	free(tempfile);
-	return CL_BREAK;
+	return CL_EIO;
       }
 
       current_block = ole2_get_next_block_number(fd, hdr, current_block);
@@ -1048,8 +1008,9 @@ int cli_ole2_extract(int fd, const char *dirname, cli_ctx *ctx, struct uniq **vb
 	hdr.sbat_root_start = -1;
 
 	hdr.bitset = cli_bitset_init();
-	if (!hdr.bitset) { /* FIXME: mmap leaks here */
-		return CL_EOLE2;
+	if (!hdr.bitset) {
+		ret=CL_EOLE2;
+		goto abort;
 	}
 
 	if (memcmp(hdr.magic, magic_id, 8) != 0) {
@@ -1077,13 +1038,6 @@ int cli_ole2_extract(int fd, const char *dirname, cli_ctx *ctx, struct uniq **vb
 	print_ole2_header(&hdr);
 	cli_dbgmsg("Max block number: %lu\n", (unsigned long int) hdr.max_block_no);
 
-	/* NOTE: Select only ONE of the following two methods */
-	
-	/* ole2_read_property_tree(fd, &hdr, dirname, handler_writefile); */
-	
-	/* OR */
-	
-
 	/* PASS 1 : Count files and check for VBA */
 	//	__asm__ __volatile__("int3");
 	hdr.has_vba = 0;
@@ -1107,7 +1061,7 @@ int cli_ole2_extract(int fd, const char *dirname, cli_ctx *ctx, struct uniq **vb
 	  ret = CL_CLEAN;
 	  *vba = hdr.U;
 	} else {
-	  cli_dbgmsg("OLE2: no VBA projects found %d\n", ret);
+	  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);