From cd175933564ce8a5277c66a918fae02c850b5a10 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Wed, 6 Aug 2008 03:24:56 +0000 Subject: [PATCH] Since powerof() can return an error condition, it's foolhardy not to detect and deal with that condition. (Related to issue #13240) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@135915 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/translate.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/main/translate.c b/main/translate.c index 3f5466d1fa..deb977954b 100644 --- a/main/translate.c +++ b/main/translate.c @@ -273,7 +273,12 @@ struct ast_trans_pvt *ast_translator_build_path(int dest, int source) source = powerof(source); dest = powerof(dest); - + + if (source == -1 || dest == -1) { + ast_log(LOG_WARNING, "No translator path: (%s codec is not valid)\n", source == -1 ? "starting" : "ending"); + return NULL; + } + AST_LIST_LOCK(&translators); while (source != dest) { @@ -694,6 +699,10 @@ int __ast_register_translator(struct ast_translator *t, struct ast_module *mod) t->dstfmt = powerof(t->dstfmt); t->active = 1; + if (t->srcfmt == -1 || t->dstfmt == -1) { + ast_log(LOG_WARNING, "Invalid translator path: (%s codec is not valid)\n", t->srcfmt == -1 ? "starting" : "ending"); + return -1; + } if (t->plc_samples) { if (t->buffer_samples < t->plc_samples) { ast_log(LOG_WARNING, "plc_samples %d buffer_samples %d\n", @@ -868,6 +877,10 @@ unsigned int ast_translate_path_steps(unsigned int dest, unsigned int src) src = powerof(src); dest = powerof(dest); + if (src == -1 || dest == -1) { + ast_log(LOG_WARNING, "No translator path: (%s codec is not valid)\n", src == -1 ? "starting" : "ending"); + return -1; + } AST_LIST_LOCK(&translators); if (tr_matrix[src][dest].step) -- 2.47.3