diff options
author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-13 19:41:22 +0000 |
---|---|---|
committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-13 19:41:22 +0000 |
commit | f46cc4106e8285505b1290f10bf2d933eafc7157 (patch) | |
tree | a018c80bee4b1f21fd9135e5e0fd0598301d6d07 | |
parent | c264320e59aa3a1276d64608a2f4c7eb68eaa739 (diff) |
Merge changes from 1.6.1 branch and update ChangeLog.v1.6.1.19-rc2
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1.19-rc2@257216 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | channels/chan_sip.c | 2 |
2 files changed, 13 insertions, 1 deletions
@@ -2,6 +2,18 @@ * Asterisk 1.6.1.19-rc2 Released +2010-04-13 [r257208] Tilghman Lesher <tlesher@digium.com + + Also unref the pvt when we delete the provisional keepalive job. + + (closes issue #16774) + Reported by: kowalma + Patches: + 20100315__issue16774.diff.txt uploaded by tilghman (license 14) + Tested by: falves11, jamicque + + Review: https://reviewboard.asterisk.org/r/591/ + 2010-04-05 Leif Madsen <lmadsen@digium.com> * Asterisk 1.6.1.19-rc1 Released diff --git a/channels/chan_sip.c b/channels/chan_sip.c index fbef8abe1..1b6d4e3e7 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5667,7 +5667,7 @@ static int sip_hangup(struct ast_channel *ast) } } else { /* Incoming call, not up */ const char *res; - AST_SCHED_DEL(sched, p->provisional_keepalive_sched_id); + AST_SCHED_DEL_UNREF(sched, p->provisional_keepalive_sched_id, dialog_unref(p, "when you delete the provisional_keepalive_sched_id, you should dec the refcount for the stored dialog ptr")); if (p->hangupcause && (res = hangup_cause2sip(p->hangupcause))) transmit_response_reliable(p, res, &p->initreq); else |