[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2124-gfb6e835

[Günther Deschner]

The branch, master has been updated
       via  fb6e83554364b6ed9dde33cf1a1f728e19ab6dd6 (commit)
      from  2775c52baabc042089c7d1663d1fedb9b189bfab (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fb6e83554364b6ed9dde33cf1a1f728e19ab6dd6
Author: Günther Deschner <gd at samba.org>
Date:   Mon Jun 8 10:40:57 2009 +0200

    s3-charcnv: always talloc_free in convert_string_talloc() error path.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/charcnv.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index bb9b205..791c866 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -586,8 +586,7 @@ bool convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_t to,
 		/* wrapped ! abort. */
 		if (!conv_silent)
 			DEBUG(0, ("convert_string_talloc: destlen wrapped !\n"));
-		if (!ctx)
-			TALLOC_FREE(outbuf);
+		TALLOC_FREE(outbuf);
 		errno = EOPNOTSUPP;
 		return false;
 	} else {


-- 
Samba Shared Repository