From 8f4b2be484ab96d23a2de292524ed2dd869a8d00 Mon Sep 17 00:00:00 2001 From: mnicholson Date: Tue, 1 Dec 2009 15:48:49 +0000 Subject: Merged revisions 231741 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r231741 | mnicholson | 2009-12-01 09:47:36 -0600 (Tue, 01 Dec 2009) | 9 lines Merged revisions 231740 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r231740 | mnicholson | 2009-12-01 09:34:57 -0600 (Tue, 01 Dec 2009) | 2 lines Ignore unknown formats in ast_format_str_reduce() and return an error if no know formats are found. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@231742 f38db490-d61c-443f-a65b-d21fe96a405b --- main/file.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/main/file.c b/main/file.c index f35ff6fa3..1549b9d7b 100644 --- a/main/file.c +++ b/main/file.c @@ -1358,7 +1358,7 @@ char *ast_format_str_reduce(char *fmts) 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_RWLIST_RDLOCK(&formats)) { @@ -1385,11 +1385,19 @@ char *ast_format_str_reduce(char *fmts) } AST_RWLIST_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; } @@ -1408,6 +1416,11 @@ char *ast_format_str_reduce(char *fmts) } } + if (first) { + ast_log(LOG_WARNING, "no known formats found in format list (%s)\n", orig); + return NULL; + } + return orig; } -- cgit v1.2.3