diff options
| author | Matthew Jordan <mjordan@digium.com> | 2012-05-18 15:51:16 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2012-05-18 15:51:16 +0000 |
| commit | 6eb4e81033e61d161558fd7cdb015d54e5ac5501 (patch) | |
| tree | 297cb73b0df3930d54f022b546b85f56b2cc8dda /channels | |
| parent | 7b51320642349100921af1308cb277c21d4fe18c (diff) | |
Fix more memory leaks
This patch adds to what was fixed in r366880. Specifically, it addresses the
following:
* chan_sip: dispose of an allocated frame in off nominal code paths in
sip_rtp_read
* func_odbc: when disposing of an allocated resultset, ensure that any rows
that were appended to that resultset are also disposed of
* cli: free the created return string buffer in another off nominal code
path
* chan_dahdi: free a frame that was allocated by the dsp layer if we choose
not to process that frame
(issue ASTERISK-19665)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/1922/
........
Merged revisions 366944 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 366948 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@366955 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 1 | ||||
| -rw-r--r-- | channels/chan_sip.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 77b2eb8f0..38a894395 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -9321,6 +9321,7 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast) } else if (p->dialtone_detect && !p->outgoing && f->frametype == AST_FRAME_VOICE) { if ((ast_dsp_get_tstate(p->dsp) == DSP_TONE_STATE_DIALTONE) && (ast_dsp_get_tcount(p->dsp) > 9)) { /* Dialtone detected on inbound call; hangup the channel */ + ast_frfree(f); f = NULL; } } else if (f->frametype == AST_FRAME_DTMF_BEGIN diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a21ebf394..e2d2daf5e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7582,6 +7582,7 @@ static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p if (f && (f->frametype == AST_FRAME_DTMF_BEGIN || f->frametype == AST_FRAME_DTMF_END) && (ast_test_flag(&p->flags[0], SIP_DTMF) != SIP_DTMF_RFC2833)) { ast_debug(1, "Ignoring DTMF (%c) RTP frame because dtmfmode is not RFC2833\n", f->subclass.integer); + ast_frfree(f); return &ast_null_frame; } @@ -7594,6 +7595,7 @@ static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p if (!ast_format_cap_iscompatible(p->jointcaps, &f->subclass.format)) { ast_debug(1, "Bogus frame of format '%s' received from '%s'!\n", ast_getformatname(&f->subclass.format), ast_channel_name(p->owner)); + ast_frfree(f); return &ast_null_frame; } ast_debug(1, "Oooh, format changed to %s\n", |