aboutsummaryrefslogtreecommitdiffstats
path: root/main/manager.c
diff options
context:
space:
mode:
authormvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-13 22:53:25 +0000
committermvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-13 22:53:25 +0000
commit46a43f9d051ab0fd92fb1fc87435506d5ee6f934 (patch)
tree0e30de1ae3a5f418e75c1f284cd4b74ba2401466 /main/manager.c
parent7a6f03c46c581018773aeefff70446e9dbecea6f (diff)
Merged revisions 130574 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r130574 | mvanbaak | 2008-07-14 00:50:31 +0200 (Mon, 14 Jul 2008) | 16 lines Merged revisions 130573 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130573 | mvanbaak | 2008-07-14 00:48:51 +0200 (Mon, 14 Jul 2008) | 8 lines fix memory leak when originate from manager cannot create a thread (closes issue #13069) Reported by: gknispel_proformatique Patches: asterisk_trunk_action_originate.patch uploaded by gknispel (license 261) Tested by: gknispel_proformatique, mvanbaak ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130575 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
-rw-r--r--main/manager.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/manager.c b/main/manager.c
index 3b580005c..8b91262b1 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2195,6 +2195,7 @@ static int action_originate(struct mansession *s, const struct message *m)
fast->timeout = to;
fast->priority = pi;
if (ast_pthread_create_detached(&th, NULL, fast_originate, fast)) {
+ ast_free(fast);
res = -1;
} else {
res = 0;