[asterisk-commits] mmichelson: branch 1.6.0 r223226 - in /branches/1.6.0: ./ apps/app_dial.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Oct  9 13:20:13 2009
New Revision: 223226

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=223226
Log:
Merged revisions 223215 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r223215 | mmichelson | 2009-10-09 13:17:34 -0500 (Fri, 09 Oct 2009) | 9 lines
  
  Recorded merge of revisions 223213 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r223213 | mmichelson | 2009-10-09 13:17:12 -0500 (Fri, 09 Oct 2009) | 3 lines
    
    Fix potential memory leak in app_dial.c
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_dial.c

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

Modified: branches/1.6.0/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_dial.c?view=diff&rev=223226&r1=223225&r2=223226
==============================================================================
--- branches/1.6.0/apps/app_dial.c (original)
+++ branches/1.6.0/apps/app_dial.c Fri Oct  9 13:20:13 2009
@@ -1448,6 +1448,7 @@
 			datastore->inheritance = DATASTORE_INHERIT_FOREVER;
 
 			if (!(dialed_interfaces = ast_calloc(1, sizeof(*dialed_interfaces)))) {
+				ast_channel_datastore_free(datastore);
 				ast_free(tmp);
 				goto out;
 			}