From: Günther Deschner <gd@samba.org>
Date: Mon, 8 Jun 2009 08:40:57 +0000 (+0200)
Subject: s3-charcnv: always talloc_free in convert_string_talloc() error path.
X-Git-Tag: tdb-1.1.5~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb6e83554364b6ed9dde33cf1a1f728e19ab6dd6;p=thirdparty%2Fsamba.git

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

Guenther
---

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index bb9b2054d10..791c866b576 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 {