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

    Revert "fix memory leak (patch from TK)"
    
    This reverts commit f050045f3ba56cdeed052b0b78d0b8f3ab17b1ca.

diff --git a/ChangeLog b/ChangeLog
index dfdcfca..0753613 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Tue Mar 18 13:35:00 EET 2008 (edwin)
-------------------------------------
-  * libclamav/entconv.c: fix memory leak (patch from TK)
-
 Tue Mar 18 11:25:00 CET 2008 (tk)
 ---------------------------------
   * libclamav/mspack.c: fix handling of MSZIP compressed folders (bb#882)
diff --git a/libclamav/entconv.c b/libclamav/entconv.c
index bfcbb32..1af3637 100644
--- a/libclamav/entconv.c
+++ b/libclamav/entconv.c
@@ -788,7 +788,6 @@ int encoding_normalize_toascii(const m_area_t* in_m_area, const char* initial_en
 		free(encoding);
 		return -1;
 	}
-	free(encoding);
 	in_iconv_u16(in_m_area, &iconv_struct, out_m_area);
 	for(i = 0, j = 0; i < out_m_area->length ; i += 2) {
 		const unsigned char c = (out_m_area->buffer[i] << 4) + out_m_area->buffer[i+1];

-- 
Debian repository for ClamAV