mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 12:36:58 +00:00
fix for 9373 (duplicate context in AEL crashes asterisk). I turned a duplicate context from a WARNING to an ERROR. Now you get a module load failure, and asterisk just exits. That's better than a crash, right\?
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@59228 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2220,9 +2220,9 @@ static void check_context_names(void)
|
||||
if ( j->type == PV_CONTEXT || j->type == PV_MACRO ) {
|
||||
if ( !strcmp(i->u1.str, j->u1.str) )
|
||||
{
|
||||
ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: The context name (%s) is also declared in file %s, line %d-%d!\n",
|
||||
ast_log(LOG_ERROR,"Error: file %s, line %d-%d: The context name (%s) is also declared in file %s, line %d-%d!\n",
|
||||
i->filename, i->startline, i->endline, i->u1.str, j->filename, j->startline, j->endline);
|
||||
warns++;
|
||||
errs++;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2317,7 +2317,7 @@ void check_pval_item(pval *item, struct argapp *apps, int in_globals)
|
||||
macro_def = find_macro(item->u1.str);
|
||||
if (!macro_def) {
|
||||
/* here is a good place to check to see if the definition is in extensions.conf! */
|
||||
ast_log(LOG_WARNING, "Error: file %s, line %d-%d: macro call to non-existent %s ! Hopefully it is present in extensions.conf! \n",
|
||||
ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: macro call to non-existent %s ! Hopefully it is present in extensions.conf! \n",
|
||||
item->filename, item->startline, item->endline, item->u1.str);
|
||||
warns++;
|
||||
} else if (macro_def->type != PV_MACRO) {
|
||||
|
Reference in New Issue
Block a user