[svn-commits] jrose: trunk r423526 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Fri Sep 19 10:11:06 2014
New Revision: 423526

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423526
Log:
chan_iax2: Fix a crash when using chan_iax2 jitterbuffer settings

Caused by format changes in Asterisk 13

ASTERISK-24265 #close
Reported by: Dafi Ni
Review: https://reviewboard.asterisk.org/r/3999/
........

Merged revisions 423524 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=423526&r1=423525&r2=423526
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Fri Sep 19 10:11:06 2014
@@ -4123,7 +4123,7 @@
 	if(ms >= (next = jb_next(pvt->jb))) {
 		struct ast_format *voicefmt;
 		voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat);
-		ret = jb_get(pvt->jb, &frame, ms, ast_format_get_default_ms(voicefmt));
+		ret = jb_get(pvt->jb, &frame, ms, voicefmt ? ast_format_get_default_ms(voicefmt) : 20);
 		switch(ret) {
 		case JB_OK:
 			fr = frame.data;