[asterisk-commits] tilghman: branch 1.6.1 r206810 - in /branches/1.6.1: ./ funcs/func_realtime.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Jul 16 11:53:02 2009
New Revision: 206810

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=206810
Log:
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)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_realtime.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/funcs/func_realtime.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/funcs/func_realtime.c?view=diff&rev=206810&r1=206809&r2=206810
==============================================================================
--- branches/1.6.1/funcs/func_realtime.c (original)
+++ branches/1.6.1/funcs/func_realtime.c Thu Jul 16 11:53:02 2009
@@ -86,6 +86,8 @@
 		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 @@
 	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);