[asterisk-commits] mjordan: branch 1.8 r362368 - /branches/1.8/main/frame.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue Apr 17 16:18:06 2012
New Revision: 362368

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

Modified:
    branches/1.8/main/frame.c

Modified: branches/1.8/main/frame.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/frame.c?view=diff&rev=362368&r1=362367&r2=362368
==============================================================================
--- branches/1.8/main/frame.c (original)
+++ branches/1.8/main/frame.c Tue Apr 17 16:18:06 2012
@@ -1195,6 +1195,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 < ARRAY_LEN(AST_FORMAT_LIST); x++) {
 		if (pref->order[x] == (idx + 1)) {
 			framems = pref->framing[x];