]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 223215 via svnmerge from
authorMark Michelson <mmichelson@digium.com>
Fri, 9 Oct 2009 18:25:19 +0000 (18:25 +0000)
committerMark Michelson <mmichelson@digium.com>
Fri, 9 Oct 2009 18:25:19 +0000 (18:25 +0000)
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.1@223241 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_dial.c

index 1d57a6a91ea530ebf11cbae37a8b3971d6305457..4dc007ea45eec0e9101ee40b51f53fa521d0500c 100644 (file)
@@ -1477,6 +1477,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_datastore_free(datastore);
                                ast_free(tmp);
                                goto out;
                        }