From fb6e83554364b6ed9dde33cf1a1f728e19ab6dd6 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 8 Jun 2009 10:40:57 +0200
Subject: s3-charcnv: always talloc_free in convert_string_talloc() error path.

Guenther
---
 source3/lib/charcnv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/lib')

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