diff options
| author | Alexandr Anikin <may@telecom-service.ru> | 2011-12-02 18:03:31 +0000 |
|---|---|---|
| committer | Alexandr Anikin <may@telecom-service.ru> | 2011-12-02 18:03:31 +0000 |
| commit | db0ed2e5c8adbaf2c46a9dacdc9a29784f75769f (patch) | |
| tree | 741093de841b93615906f7bd1fd78762e7dbe163 /channels | |
| parent | 83cd844b82ef1a415a53eb7fe4cc30aac30f2ee7 (diff) | |
Merged revisions 346763 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r346763 | may | 2011-12-02 20:42:32 +0400 (Fri, 02 Dec 2011) | 14 lines
Merged revisions 346762 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r346762 | may | 2011-12-02 20:19:19 +0400 (Fri, 02 Dec 2011) | 7 lines
process null frame pointer returned by ast_rtp_instance_read correctly
(closes issue ASTERISK-16697)
Reported by: under
Patches:
segfault.diff (License #5871) patch uploaded by under
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@346777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_h323.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 23952b7db..5f2872086 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -772,7 +772,7 @@ static struct ast_frame *oh323_rtp_read(struct oh323_pvt *pvt) if (f && (f->frametype == AST_FRAME_DTMF) && !(pvt->options.dtmfmode & (H323_DTMF_RFC2833 | H323_DTMF_CISCO))) { return &ast_null_frame; } - if (pvt->owner) { + if (f && pvt->owner) { /* We already hold the channel lock */ if (f->frametype == AST_FRAME_VOICE) { if (!ast_format_cap_iscompatible(pvt->owner->nativeformats, &f->subclass.format)) { |