From 962a9d61f8666607b25fd3307cd938576ee60da0 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Thu, 11 Feb 2016 12:21:42 -0500 Subject: func_iconv: Ensure output strings are properly terminated. ASTERISK-25272 #close Reported by: Etienne Lessard patches: AST-25272.patch submitted by Etienne Lessard (license #6394) Change-Id: Id75ad202300960a1e91afe15e319d992936ecc17 --- funcs/func_iconv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'funcs') diff --git a/funcs/func_iconv.c b/funcs/func_iconv.c index c3d02865c..0a8e57dd7 100644 --- a/funcs/func_iconv.c +++ b/funcs/func_iconv.c @@ -83,7 +83,7 @@ static int iconv_read(struct ast_channel *chan, const char *cmd, char *arguments AST_APP_ARG(text); ); iconv_t cd; - size_t incount, outcount = len; + size_t incount, outcount = len - 1; char *parse; if (ast_strlen_zero(arguments)) { @@ -120,6 +120,7 @@ static int iconv_read(struct ast_channel *chan, const char *cmd, char *arguments else ast_log(LOG_WARNING, "Iconv: error %d: %s.\n", errno, strerror(errno)); } + *buf = '\0'; iconv_close(cd); return 0; -- cgit v1.2.3