diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-12 17:29:17 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-12 17:29:17 +0000 |
| commit | 30ed5ed291cdcad37642eb71631a616cd2ab3e25 (patch) | |
| tree | 639d9768258f002fd8ccd8f64ea1ec66c41e7a05 | |
| parent | 14834b987bf2bc2a1e6bbcf2bfd7550f3b083874 (diff) | |
Fix two cases of memory corruption caused by background threads.
Reported by: atis
Patch by: tilghman
Fixes issue #10923
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@89184 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 8 | ||||
| -rw-r--r-- | main/channel.c | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 0b52a8677..8b9f96f74 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2067,6 +2067,14 @@ static int __sip_autodestruct(const void *data) return 10000; /* Reschedule this destruction so that we know that it's gone */ } + /* If there are packets still waiting for delivery, delay the destruction */ + if (p->packets) { + if (option_debug > 2) + ast_log(LOG_DEBUG, "Re-scheduled destruction of SIP call %s\n", p->callid ? p->callid : "<unknown>"); + append_history(p, "ReliableXmit", "timeout"); + return 10000; + } + /* If we're destroying a subscription, dereference peer object too */ if (p->subscribed == MWI_NOTIFICATION && p->relatedpeer) ASTOBJ_UNREF(p->relatedpeer,sip_destroy_peer); diff --git a/main/channel.c b/main/channel.c index 00e57117b..c9de79bc0 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1709,6 +1709,8 @@ int ast_hangup(struct ast_channel *chan) detach_spies(chan); /* get rid of spies */ + ast_autoservice_stop(chan); + if (chan->masq) { if (ast_do_masquerade(chan)) ast_log(LOG_WARNING, "Failed to perform masquerade\n"); |