[svn-commits] may: branch 10 r346763 - in /branches/10: ./ addons/ channels/

[SVN commits to the Digium repositories]

Author: may
Date: Fri Dec  2 10:42:32 2011
New Revision: 346763

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=346763
Log:
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
........

Modified:
    branches/10/   (props changed)
    branches/10/addons/chan_ooh323.c
    branches/10/channels/chan_h323.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/addons/chan_ooh323.c?view=diff&rev=346763&r1=346762&r2=346763
==============================================================================
--- branches/10/addons/chan_ooh323.c (original)
+++ branches/10/addons/chan_ooh323.c Fri Dec  2 10:42:32 2011
@@ -4576,7 +4576,7 @@
 		f = &null_frame;
 	}
 
-	if (p->owner && !p->faxmode && (f->frametype == AST_FRAME_VOICE)) {
+	if (f && p->owner && !p->faxmode && (f->frametype == AST_FRAME_VOICE)) {
 		/* We already hold the channel lock */
 		if (!(ast_format_cap_iscompatible(p->owner->nativeformats, &f->subclass.format))) {
 			ast_debug(1, "Oooh, voice format changed to %s\n", ast_getformatname(&f->subclass.format));

Modified: branches/10/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_h323.c?view=diff&rev=346763&r1=346762&r2=346763
==============================================================================
--- branches/10/channels/chan_h323.c (original)
+++ branches/10/channels/chan_h323.c Fri Dec  2 10:42:32 2011
@@ -772,7 +772,7 @@
 	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)) {