From: Mark Michelson <mmichelson@digium.com>
Date: Fri, 9 Oct 2009 18:20:13 +0000 (+0000)
Subject: Merged revisions 223215 via svnmerge from
X-Git-Tag: 1.6.0.18-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97136b0957098e81a3fdc46c26084d0ebc31b4b2;p=thirdparty%2Fasterisk.git

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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@223226 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_dial.c b/apps/app_dial.c
index d5593bb5d1..54082d5481 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1448,6 +1448,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 			datastore->inheritance = DATASTORE_INHERIT_FOREVER;
 
 			if (!(dialed_interfaces = ast_calloc(1, sizeof(*dialed_interfaces)))) {
+				ast_channel_datastore_free(datastore);
 				ast_free(tmp);
 				goto out;
 			}