[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 57d4dfa73382b3d6983b5a7dce678222408219f7
Merge: 846f2e21323e5e4e2fa514a4e91aa8b374a7eab4 a4d5efb4fefed5361c21512e17e00d39f150cc69
Author: aCaB <acab at clamav.net>
Date:   Mon Aug 31 14:40:33 2009 +0200

    Merge branch 'master' into replace-mmap

diff --combined libclamav/scanners.c
index 261af05,10e8fba..192ac3e
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@@ -1116,9 -1116,9 +1116,9 @@@ static int cli_scanhtml_utf16(int desc
  	    if(write(fd, decoded, strlen(decoded)) == -1) {
  		cli_errmsg("cli_scanhtml_utf16: Can't write to file %s\n", tempname);
  		free(decoded);
+ 		close(fd);
  		cli_unlink(tempname);
  		free(tempname);
- 		close(fd);
  		return CL_EWRITE;
  	    }
  	    free(decoded);
@@@ -1270,11 -1270,11 +1270,11 @@@ static int cli_scanmschm(int desc, cli_
      }
  
     do {
 -	ret = cli_chm_prepare_file(desc, dir, &metadata);
 +	ret = cli_chm_prepare_file(&metadata);
  	if (ret != CL_SUCCESS) {
  	   break;
  	}
 -	ret = cli_chm_extract_file(desc, dir, &metadata, ctx);
 +	ret = cli_chm_extract_file(dir, &metadata, ctx);
  	if (ret == CL_SUCCESS) {
  	    lseek(metadata.ofd, 0, SEEK_SET);
  	    rc = cli_magic_scandesc(metadata.ofd, ctx);

-- 
Debian repository for ClamAV