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

    Revert "nsis typoes"
    
    This reverts commit 045107dd42c832f5b3755f3ed61a2cab7406e2da.

diff --git a/ChangeLog b/ChangeLog
index 05e16bf..690b50a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Tue Mar 25 01:55:19 CET 2008 (acab)
------------------------------------
-  * libclamav/nsis: typoes - bb#894
-
 Mon Mar 24 21:22:16 EET 2008 (edwin)
 -----------------------------------
   * libclamav/str.c: cli_warnmsg -> cli_dbgmsg (bb #892)
diff --git a/libclamav/nsis/nulsft.c b/libclamav/nsis/nulsft.c
index a5d01b2..a0e1bd8 100644
--- a/libclamav/nsis/nulsft.c
+++ b/libclamav/nsis/nulsft.c
@@ -315,7 +315,7 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {
 	if (gotsome) {
 	  ret = CL_SUCCESS;
 	} else {
-	  ret = CL_EMAXSIZE;
+	  ret CL_EMAXSIZE;
 	  close(n->ofd);
 	}
 	free(ibuf);
@@ -420,6 +420,7 @@ static int nsis_unpack_next(struct nsis_st *n, cli_ctx *ctx) {
       gotsome=1;
       if (cli_writen(n->ofd, obuf, n->nsis.next_out - obuf) != n->nsis.next_out - obuf) {
 	cli_dbgmsg("NSIS: cannot write output file"__AT__"\n");
+	free(ibuf);
 	close(n->ofd);
 	return CL_EIO;
       }

-- 
Debian repository for ClamAV