[asterisk-commits] mnicholson: branch 1.4 r231740 - /branches/1.4/main/file.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Dec 1 09:34:59 CST 2009
Author: mnicholson
Date: Tue Dec 1 09:34:57 2009
New Revision: 231740
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=231740
Log:
Ignore unknown formats in ast_format_str_reduce() and return an error if no know formats are found.
Modified:
branches/1.4/main/file.c
Modified: branches/1.4/main/file.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/file.c?view=diff&rev=231740&r1=231739&r2=231740
==============================================================================
--- branches/1.4/main/file.c (original)
+++ branches/1.4/main/file.c Tue Dec 1 09:34:57 2009
@@ -1365,7 +1365,7 @@
char *fmts_str[AST_MAX_FORMATS];
char *stringp, *type;
char *orig = fmts;
- int i, j, x, found;
+ int i, j, x, first, found;
int len = strlen(fmts) + 1;
if (AST_LIST_LOCK(&formats)) {
@@ -1392,11 +1392,19 @@
}
AST_LIST_UNLOCK(&formats);
+ first = 1;
for (i = 0; i < x; i++) {
+ /* ignore invalid entries */
+ if (!fmts_ptr[i]) {
+ ast_log(LOG_WARNING, "ignoring unknown format '%s'\n", fmts_str[i]);
+ continue;
+ }
+
/* special handling for the first entry */
- if (i == 0) {
+ if (first) {
fmts += snprintf(fmts, len, "%s", fmts_str[i]);
len -= (fmts - orig);
+ first = 0;
continue;
}
@@ -1413,6 +1421,11 @@
fmts += snprintf(fmts, len, "|%s", fmts_str[i]);
len -= (fmts - orig);
}
+ }
+
+ if (first) {
+ ast_log(LOG_WARNING, "no known formats found in format list (%s)\n", orig);
+ return NULL;
}
return orig;
More information about the asterisk-commits
mailing list