kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-05 03:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 135938 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r135938 | tilghman | 2008-08-05 22:29:42 -0500 (Tue, 05 Aug 2008) | 12 lines

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/branches/1.6.0@135942 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-08-06 03:30:23 +00:00
parent 4a854a5e5b
commit 58c8e58fe5
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/translate.c
View File

@@ -265,7 +265,12 @@ struct ast_trans_pvt *ast_translator_build_path(int dest, int source)
source = powerof(source); source = powerof(source);
dest = powerof(dest); 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); AST_RWLIST_RDLOCK(&translators);
while (source != dest) { 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->dstfmt = powerof(t->dstfmt);
t->active = 1; 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->plc_samples) {
if (t->buffer_samples < t->plc_samples) { if (t->buffer_samples < t->plc_samples) {
ast_log(LOG_WARNING, "plc_samples %d buffer_samples %d\n", 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); src = powerof(src);
dest = powerof(dest); 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); AST_RWLIST_RDLOCK(&translators);
if (tr_matrix[src][dest].step) if (tr_matrix[src][dest].step)