Merged revisions 67420 via svnmerge from

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

........
r67420 | murf | 2007-06-05 12:17:28 -0600 (Tue, 05 Jun 2007) | 1 line

Added code to automatically add a default case to switches that don't have one. In some cases, rather than fall thru, it results in a goto with -1 result, which terminates the extension; a sort of dialplan seqfault, sort of. This was required to fix bug reported in 9881
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67423 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Steve Murphy 18 years ago
parent 48ac1e8a86
commit 00b33aaa49

@ -2325,6 +2325,33 @@ void check_switch_expr(pval *item, struct argapp *apps)
warns++;
}
}
#else
pval *t,*tl=0,*p2;
int def= 0;
/* first of all, does this switch have a default case ? */
for (t=item->u2.statements; t; t=t->next) {
if (t->type == PV_DEFAULT) {
def =1;
break;
}
tl = t;
}
if (def) /* nothing to check. All cases accounted for! */
return;
/* if no default, warn and insert a default case at the end */
p2 = tl->next = calloc(1, sizeof(struct pval));
p2->type = PV_DEFAULT;
p2->startline = tl->startline;
p2->endline = tl->endline;
p2->startcol = tl->startcol;
p2->endcol = tl->endcol;
p2->filename = strdup(tl->filename);
ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: A default case was automatically added to the switch.\n",
p2->filename, p2->startline, p2->endline);
warns++;
#endif
}

Loading…
Cancel
Save