diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-08-06 03:29:42 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-08-06 03:29:42 +0000 |
| commit | b2a42c33530d597e0ed4208d4a2ae7ca8b94ac81 (patch) | |
| tree | e79ecbe68fbd494576330512c87379caede18574 /main/translate.c | |
| parent | 29228a3afc493c7783dff7de78bf033498e8f807 (diff) | |
Merged revisions 135915 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r135915 | tilghman | 2008-08-05 22:24:56 -0500 (Tue, 05 Aug 2008) | 4 lines
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/trunk@135938 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/translate.c')
| -rw-r--r-- | main/translate.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/main/translate.c b/main/translate.c index 4ee94d940..96d67bc92 100644 --- a/main/translate.c +++ b/main/translate.c @@ -265,7 +265,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_RWLIST_RDLOCK(&translators); while (source != dest) { @@ -625,6 +630,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", @@ -794,6 +803,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_RWLIST_RDLOCK(&translators); if (tr_matrix[src][dest].step) |