From: Tilghman Lesher Date: Thu, 16 Jul 2009 16:53:02 +0000 (+0000) Subject: Merged revisions 206808 via svnmerge from X-Git-Tag: 1.6.1.3-rc1~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=288c4158c9dde8b36a503927379b57561ac900d7;p=thirdparty%2Fasterisk.git Merged revisions 206808 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r206808 | tilghman | 2009-07-16 11:51:05 -0500 (Thu, 16 Jul 2009) | 13 lines Merged revisions 206807 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r206807 | tilghman | 2009-07-16 11:27:35 -0500 (Thu, 16 Jul 2009) | 6 lines Fix a memory leak. (closes issue #15517) Reported by: adomjan Patches: func_realtime.c-ast_variable_destroy.diff uploaded by adomjan (license 487) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@206810 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c index f3dd14be68..5c6217515b 100644 --- a/funcs/func_realtime.c +++ b/funcs/func_realtime.c @@ -86,6 +86,8 @@ static int function_realtime_read(struct ast_channel *chan, const char *cmd, cha ast_str_append(&out, 0, "%s%s%s%s", var->name, args.delim2, var->value, args.delim1); ast_copy_string(buf, out->str, len); + ast_variables_destroy(head); + if (chan) ast_autoservice_stop(chan); @@ -223,6 +225,7 @@ static int function_realtime_readdestroy(struct ast_channel *chan, const char *c ast_copy_string(buf, out->str, len); ast_destroy_realtime(args.family, args.fieldmatch, args.value, SENTINEL); + ast_variables_destroy(head); if (chan) ast_autoservice_stop(chan);