sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "pbx.c: Properly parse labels with leading digits"

This commit is contained in:
George Joseph 2019-04-12 14:16:10 -05:00 committed by Gerrit Code Review
parent 61567ee4e8 2cf4e8bff9
commit 16c80b5a0d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/pbx.c
View File

@ -8760,6 +8760,7 @@ static int pbx_parseable_goto(struct ast_channel *chan, const char *goto_string,
char *stringp;
int ipri;
int mode = 0;
char rest[2] = "";
if (ast_strlen_zero(goto_string)) {
ast_log(LOG_WARNING, "Goto requires an argument ([[context,]extension,]priority)\n");
@ -8785,7 +8786,7 @@ static int pbx_parseable_goto(struct ast_channel *chan, const char *goto_string,
mode = -1;
pri++;
}
if (sscanf(pri, "%30d", &ipri) != 1) {
if (sscanf(pri, "%30d%1s", &ipri, rest) != 1) {
ipri = ast_findlabel_extension(chan, context ? context : ast_channel_context(chan),
exten ? exten : ast_channel_exten(chan), pri,
S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL));