From 90bf5c054979f678f41c9afe284243031ad351be Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 7 Sep 2010 20:56:53 +0000
Subject: [PATCH] Merged revisions 285367 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r285367 | tilghman | 2010-09-07 15:56:07 -0500 (Tue, 07 Sep 2010) | 23 lines
Merged revisions 285366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r285366 | tilghman | 2010-09-07 15:31:41 -0500 (Tue, 07 Sep 2010) | 16 lines
Merged revisions 285365 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r285365 | tilghman | 2010-09-07 15:30:22 -0500 (Tue, 07 Sep 2010) | 9 lines
Catch invalid extensions at the parser, instead of making the core deal with them.
(closes issue #17794)
Reported by: PavelL
Patches:
20100820__issue17794__1.6.2.diff.txt uploaded by tilghman (license 14)
20100820__issue17794__1.4.diff.txt uploaded by tilghman (license 14)
Tested by: PavelL
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285368 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
pbx/pbx_config.c | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 1617d5f866..0baa8e17c4 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1456,15 +1456,15 @@ process_extension:
*cidmatch++ = '\0';
ast_shrink_phone_number(cidmatch);
}
- pri = S_OR(strsep(&stringp, ","), "");
- pri = ast_skip_blanks(pri);
- pri = ast_trim_blanks(pri);
+ pri = ast_strip(S_OR(strsep(&stringp, ","), ""));
if ((label = strchr(pri, '('))) {
*label++ = '\0';
if ((end = strchr(label, ')'))) {
*end = '\0';
} else {
ast_log(LOG_WARNING, "Label missing trailing ')' at line %d\n", v->lineno);
+ ast_free(tc);
+ continue;
}
}
if ((plus = strchr(pri, '+'))) {
@@ -1477,17 +1477,27 @@ process_extension:
ipri = lastpri + 1;
} else {
ast_log(LOG_WARNING, "Can't use 'next' priority on the first entry at line %d!\n", v->lineno);
+ ast_free(tc);
+ continue;
}
} else if (!strcmp(pri, "same") || !strcmp(pri, "s")) {
if (lastpri > -2) {
ipri = lastpri;
} else {
ast_log(LOG_WARNING, "Can't use 'same' priority on the first entry at line %d!\n", v->lineno);
+ ast_free(tc);
+ continue;
}
} else if (sscanf(pri, "%30d", &ipri) != 1 &&
(ipri = ast_findlabel_extension2(NULL, con, realext, pri, cidmatch)) < 1) {
ast_log(LOG_WARNING, "Invalid priority/label '%s' at line %d\n", pri, v->lineno);
ipri = 0;
+ ast_free(tc);
+ continue;
+ } else if (ipri < 1) {
+ ast_log(LOG_WARNING, "Invalid priority '%s' at line %d\n", pri, v->lineno);
+ ast_free(tc);
+ continue;
}
appl = S_OR(stringp, "");
/* Find the first occurrence of '(' */
@@ -1497,9 +1507,11 @@ process_extension:
} else {
char *orig_appl = ast_strdup(appl);
- if (!orig_appl)
- return -1;
-
+ if (!orig_appl) {
+ ast_free(tc);
+ continue;
+ }
+
appl = strsep(&stringp, "(");
/* check if there are variables or expressions without an application, like: exten => 100,hint,DAHDI/g0/${GLOBAL(var)} */
@@ -1526,8 +1538,8 @@ process_extension:
ipri += atoi(plus);
}
lastpri = ipri;
- if (!ast_opt_dont_warn && !strcmp(realext, "_.")) {
- ast_log(LOG_WARNING, "The use of '_.' for an extension is strongly discouraged and can have unexpected behavior. Please use '_X.' instead at line %d\n", v->lineno);
+ if (!ast_opt_dont_warn && (!strcmp(realext, "_.") || !strcmp(realext, "_!"))) {
+ ast_log(LOG_WARNING, "The use of '%s' for an extension is strongly discouraged and can have unexpected behavior. Please use '_X%c' instead at line %d\n", realext, realext[1], v->lineno);
}
if (ast_add_extension2(con, 0, realext, ipri, label, cidmatch, appl, strdup(data), ast_free_ptr, registrar)) {
ast_log(LOG_WARNING, "Unable to register extension at line %d\n", v->lineno);
--
GitLab