diff options
| author | Mark Michelson <mmichelson@digium.com> | 2009-03-01 21:45:08 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2009-03-01 21:45:08 +0000 |
| commit | c9252cbaf022407e70137926c3f6960c6fb2fc73 (patch) | |
| tree | eb8a8274a11018e04c6e1a35b67f81a3c0e549a2 /channels | |
| parent | d2c5b0f1def3c49cd0eb18c64f3e855e4eb89c56 (diff) | |
Properly free memory and remove scheduler entries when a transmission failure occurs.
Previously, only the "data" field of the sip_pkt created during __sip_reliable_xmit
was freed when XMIT_ERROR was returned by __sip_xmit. When retrans_pkt was called,
this inevitably resulted in the reading and writing of freed memory.
XMIT_ERROR is a condition meaning that we don't want to attempt resending the packet
at all. The proper action to take is to remove the scheduler entry we just created,
free the packet's data as well as the packet itself, and unlink it from the list of
packets on the sip_pvt structure.
(closes issue #14455)
Reported by: Nick_Lewis
Patches:
14455.patch uploaded by mmichelson (license 60)
Tested by: Nick_Lewis
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@179219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 693ee34e5..3a6362a6d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3581,8 +3581,10 @@ static enum sip_result __sip_reliable_xmit(struct sip_pvt *p, int seqno, int res if (xmitres == XMIT_ERROR) { /* Serious network trouble, no need to try again */ append_history(pkt->owner, "XmitErr", "%s", pkt->is_fatal ? "(Critical)" : "(Non-critical)"); ast_log(LOG_ERROR, "Serious Network Trouble; __sip_xmit returns error for pkt data\n"); - if (pkt->data) - ast_free(pkt->data); + AST_SCHED_DEL(sched, pkt->retransid); + p->packets = pkt->next; + ast_free(pkt->data); + ast_free(pkt); return AST_FAILURE; } else { return AST_SUCCESS; |