summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-06-08 10:40:57 +0200
committerGünther Deschner <gd@samba.org>2009-06-08 10:44:50 +0200
commitfb6e83554364b6ed9dde33cf1a1f728e19ab6dd6 (patch)
tree810664b2d778e33311cc2b77b1969d3a96aec521
parent2775c52baabc042089c7d1663d1fedb9b189bfab (diff)
downloadsamba-fb6e83554364b6ed9dde33cf1a1f728e19ab6dd6.tar.gz
samba-fb6e83554364b6ed9dde33cf1a1f728e19ab6dd6.tar.bz2
samba-fb6e83554364b6ed9dde33cf1a1f728e19ab6dd6.zip
s3-charcnv: always talloc_free in convert_string_talloc() error path.
Guenther
-rw-r--r--source3/lib/charcnv.c3
1 files changed, 1 insertions, 2 deletions
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 {