diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-18 23:55:02 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-18 23:55:02 +0000 |
| commit | 8f4137875de30d52bc9195d94a90abad5692609d (patch) | |
| tree | 9ca1c6bfc4ff9ea7a4f507ca79d6e427cf337fbe /channels | |
| parent | c8380dc8f19f448b01b828ab64c5bb5b1b27b10c (diff) | |
Merged revisions 143559 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r143559 | murf | 2008-09-18 17:41:33 -0600 (Thu, 18 Sep 2008) | 9 lines
Merged revisions 143534 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r143534 | murf | 2008-09-18 16:11:51 -0600 (Thu, 18 Sep 2008) | 1 line
A micro-fix, in sip_park_thread, where d is freed before the func is done using it.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@143561 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 21149fb7b..77119468a 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16253,12 +16253,12 @@ static void *sip_park_thread(void *stuff) transferee = d->chan1; transferer = d->chan2; copy_request(&req, &d->req); - if (d->req.data) - ast_free(d->req.data); - ast_free(d); if (!transferee || !transferer) { ast_log(LOG_ERROR, "Missing channels for parking! Transferer %s Transferee %s\n", transferer ? "<available>" : "<missing>", transferee ? "<available>" : "<missing>" ); + if (d->req.data) + ast_free(d->req.data); + free(d); return NULL; } ast_debug(4, "SIP Park: Transferer channel %s, Transferee %s\n", transferer->name, transferee->name); @@ -16268,6 +16268,9 @@ static void *sip_park_thread(void *stuff) ast_log(LOG_WARNING, "Masquerade failed.\n"); transmit_response(transferer->tech_pvt, "503 Internal error", &req); ast_channel_unlock(transferee); + if (d->req.data) + ast_free(d->req.data); + free(d); return NULL; } ast_channel_unlock(transferee); @@ -16301,6 +16304,9 @@ static void *sip_park_thread(void *stuff) ast_debug(1, "SIP Call parked failed \n"); /* Do not hangup call */ } + if (d->req.data) + ast_free(d->req.data); + free(d); return NULL; } |