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

13.27
George Joseph 6 years ago committed by Gerrit Code Review
commit 0eebc70592

@ -8616,6 +8616,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");
@ -8641,7 +8642,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));

Loading…
Cancel
Save