kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 84239 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84239 | murf | 2007-10-01 14:27:52 -0600 (Mon, 01 Oct 2007) | 1 line

closes issue #10777 -- by returning a null for the parse tree when there's really nothing there, and making sure we don't try to do checking on a null tree.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2007-10-01 23:03:50 +00:00
parent 5b5a2df463
commit b3168a76c9
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pbx/pbx_ael.c
View File

@@ -905,7 +905,7 @@ static int aeldebug = 0;
static int pbx_load_module(void)
{
int errs, sem_err, sem_warn, sem_note;
int errs=0, sem_err=0, sem_warn=0, sem_note=0;
char *rfilename;
struct ast_context *local_contexts=NULL, *con;
struct pval *parse_tree;

2
res/ael/ael.tab.c
View File

@@ -2137,8 +2137,8 @@ yyreduce:
if (!(yyvsp[(5) - (6)].pval)) {
ast_log(LOG_WARNING, "==== File: %s, Line %d, Cols: %d-%d: Warning! The empty context %s will be IGNORED!\n",
my_file, (yylsp[(4) - (6)]).first_line, (yylsp[(4) - (6)]).first_column, (yylsp[(4) - (6)]).last_column, (yyvsp[(3) - (6)].str) );
(yyval.pval) = 0;
free((yyvsp[(3) - (6)].str));
} else {
(yyval.pval) = npval2(PV_CONTEXT, &(yylsp[(1) - (6)]), &(yylsp[(6) - (6)]));
(yyval.pval)->u1.str = (yyvsp[(3) - (6)].str);

2
res/ael/ael.y
View File

@@ -205,8 +205,8 @@ context : opt_abstract KW_CONTEXT context_name LC elements RC {
if (!$5) {
ast_log(LOG_WARNING, "==== File: %s, Line %d, Cols: %d-%d: Warning! The empty context %s will be IGNORED!\n",
my_file, @4.first_line, @4.first_column, @4.last_column, $3 );
$$ = 0;
free($3);
} else {
$$ = npval2(PV_CONTEXT, &@1, &@6);
$$->u1.str = $3;

2
res/ael/pval.c
View File

@@ -2871,6 +2871,8 @@ void ael2_semantic_check(pval *item, int *arg_errs, int *arg_warns, int *arg_not
#endif
struct argapp *apps=0;
if (!item)
return; /* don't check an empty tree */
#ifdef AAL_ARGCHECK
rfilename = alloca(10 + strlen(ast_config_AST_VAR_DIR));
sprintf(rfilename, "%s/applist", ast_config_AST_VAR_DIR);