[asterisk-commits] mjordan: trunk r362380 - in /trunk: ./ main/format_pref.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue Apr 17 16:23:25 2012
New Revision: 362380

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=362380
Log:
Handle case where an unknown format is used to get the preferred codec size

In ast_codec_pref_getsize, if an unknown format is passed to the method,
no preferred codec will be selected and a negative number will be used to
index into the format list.  The method now logs an unknown format as a
warning, and returns an empty format list.

(issue ASTERISK-19655)
Reported by: Matt Jordan

Review: https://reviewboard.asterisk.org/r/1863/
........

Merged revisions 362377 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/main/format_pref.c

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

Modified: trunk/main/format_pref.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/format_pref.c?view=diff&rev=362380&r1=362379&r2=362380
==============================================================================
--- trunk/main/format_pref.c (original)
+++ trunk/main/format_pref.c Tue Apr 17 16:23:25 2012
@@ -274,6 +274,11 @@
 		}
 	}
 
+	if (idx < 0) {
+		ast_log(AST_LOG_WARNING, "Format %s unknown; unable to get preferred codec packet size\n", ast_getformatname(format));
+		return fmt;
+	}
+
 	for (x = 0; x < f_len; x++) {
 		if (pref->order[x] == (idx + 1)) {
 			framems = pref->framing[x];