From bf8f7a36bfbe5c2018dbd9a317c8791c56b4114e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 11 Apr 2017 16:06:08 -0700 Subject: [PATCH] lib:charset: Remove use of talloc_autofree_context() for global_iconv_handle All other callers use NULL here anyway, so there's no need to use a special context for get_iconv_handle(). Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider --- lib/util/charset/codepoints.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/util/charset/codepoints.c b/lib/util/charset/codepoints.c index 3bfb5cc71e8..3f380b9fed6 100644 --- a/lib/util/charset/codepoints.c +++ b/lib/util/charset/codepoints.c @@ -16506,9 +16506,15 @@ static struct smb_iconv_handle *global_iconv_handle = NULL; struct smb_iconv_handle *get_iconv_handle(void) { - if (global_iconv_handle == NULL) - global_iconv_handle = smb_iconv_handle_reinit(talloc_autofree_context(), - "ASCII", "UTF-8", true, NULL); + if (global_iconv_handle == NULL) { + global_iconv_handle = + smb_iconv_handle_reinit(NULL, + "ASCII", + "UTF-8", + true, + NULL); + } + return global_iconv_handle; } -- 2.34.1