[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 3eeb8e3b6174fb86b8493c44e124468c6ef7afa2
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:27 2008 +0100

    Revert "reapply lost cli_unlink patch"
    
    This reverts commit 0cec6b742d1608309dff8f9abd287652f4a16b20.

diff --git a/ChangeLog b/ChangeLog
index a4e2a00..d3b96d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Tue May 27 21:37:39 CEST 2008 (acab)
-------------------------------------
-  * libclamav/ole2_extract.c: use cli_unlink
-
 Tue May 27 21:22:42 CEST 2008 (acab)
 ------------------------------------
   * libclamav/ole2_extract.c: partial scan of broken ole files
diff --git a/libclamav/ole2_extract.c b/libclamav/ole2_extract.c
index c65801b..07e8230 100644
--- a/libclamav/ole2_extract.c
+++ b/libclamav/ole2_extract.c
@@ -781,7 +781,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char
   buff = (unsigned char *) cli_malloc(1 << hdr->log2_big_block_size);
   if (!buff) {
     close(ofd);
-    cli_unlink(tempfile);
+    unlink(tempfile);
     free(tempfile);
     return CL_EMEM;
   }
@@ -792,10 +792,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char
     cli_errmsg("OLE2: OTF handler init bitset failed\n");
     free(buff);
     close(ofd);
-    if (cli_unlink(tempfile)) {
-        free(tempfile);
-	return CL_EIO;
-    }
+    unlink(tempfile);
     free(tempfile);
     return CL_BREAK;
   }
@@ -826,10 +823,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char
 	close(ofd);
 	free(buff);
 	cli_bitset_free(blk_bitset);
-	if (cli_unlink(tempfile)) {
-	  free(tempfile);
-	  return CL_EIO;
-        }
+	unlink(tempfile);
 	free(tempfile);
 	return CL_BREAK;
       }
@@ -846,10 +840,7 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char
 	close(ofd);
 	free(buff);
 	cli_bitset_free(blk_bitset);
-	if (cli_unlink(tempfile)) {
-	  free(tempfile);
-	  return CL_EIO;
-        }
+	unlink(tempfile);
 	free(tempfile);
 	return CL_EIO;
       }
@@ -864,12 +855,8 @@ static int handler_otf(int fd, ole2_header_t *hdr, property_t *prop, const char
   close(ofd);
   free(buff);
   cli_bitset_free(blk_bitset);
-  if(!cli_leavetemps_flag) {
-    if (cli_unlink(tempfile)) {
-      free(tempfile);
-      return CL_EIO;
-    }
-  }
+  if(!cli_leavetemps_flag)
+    unlink(tempfile);
   free(tempfile);
   return ret==CL_VIRUS ? CL_VIRUS : CL_SUCCESS;
 

-- 
Debian repository for ClamAV