kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-19 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbx.c: Properly parse labels with leading digits

Browse Source 
If the target of a Goto is a label that starts with a number, we
erroneously treat the leading digits as a priority.

ASTERISK-20182 #close
Reported by: Janu

Change-Id: Ia78408c0805a729103917247ecfc802f6fafc94b
This commit is contained in:
Sean Bright
2019-04-11 13:49:38 -04:00
parent dd32c0239f
commit 2cf4e8bff9
1 changed files with 2 additions and 1 deletions
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; char *stringp;
int ipri; int ipri;
int mode = 0; int mode = 0;
char rest[2] = "";
if (ast_strlen_zero(goto_string)) { if (ast_strlen_zero(goto_string)) {
ast_log(LOG_WARNING, "Goto requires an argument ([[context,]extension,]priority)\n"); 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; mode = -1;
pri++; 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), ipri = ast_findlabel_extension(chan, context ? context : ast_channel_context(chan),
exten ? exten : ast_channel_exten(chan), pri, exten ? exten : ast_channel_exten(chan), pri,
S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL)); S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL));