[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/etch-security, updated. 594a24f3c0e57e508385e31054db831241cfaa56

[Stephen Gran]

The following commit has been merged in the debian/etch-security branch:
commit 594a24f3c0e57e508385e31054db831241cfaa56
Author: Stephen Gran <steve at lobefin.net>
Date:   Fri Sep 5 16:38:26 2008 +0100

    Better patch for libclamav/htmlnorm.c - this one actually applies
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/patches/46.fd-leak.CVE-2008-3914.dpatch b/debian/patches/46.fd-leak.CVE-2008-3914.dpatch
index 75b8c21..6074e2a 100644
--- a/debian/patches/46.fd-leak.CVE-2008-3914.dpatch
+++ b/debian/patches/46.fd-leak.CVE-2008-3914.dpatch
@@ -6,18 +6,18 @@
 
 @DPATCH@
 diff --git a/libclamav/htmlnorm.c b/libclamav/htmlnorm.c
-index d06f370..a85ca99 100644
+index 4c942a7..679e981 100644
 --- a/libclamav/htmlnorm.c
 +++ b/libclamav/htmlnorm.c
-@@ -1391,7 +1391,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag
- 				cli_dbgmsg("RFC2397 data file: %s\n", tmp_file);
- 				file_tmp_o1->fd = open(tmp_file, O_WRONLY|O_CREAT|O_TRUNC, S_IWUSR|S_IRUSR);
- 				free(tmp_file);
--				if (!file_tmp_o1->fd) {
-+				if (file_tmp_o1->fd < 0) {
- 					cli_dbgmsg("open failed: %s\n", filename);
- 					free(file_tmp_o1);
- 					goto abort;
+@@ -1392,7 +1392,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag
+ 					cli_dbgmsg("RFC2397 data file: %s\n", tmp_file);
+ 					file_tmp_o1->fd = open(tmp_file, O_WRONLY|O_CREAT|O_TRUNC, S_IWUSR|S_IRUSR);
+ 					free(tmp_file);
+-					if (!file_tmp_o1->fd) {
++					if (file_tmp_o1->fd < 0) {
+ 						cli_dbgmsg("open failed: %s\n", filename);
+ 						free(file_tmp_o1);
+ 						goto abort;
 @@ -1546,17 +1546,20 @@ abort:
  	}
  	if (file_buff_o1) {

-- 
Debian repository for ClamAV