diff options
| author | Sean Bright <sean.bright@gmail.com> | 2017-05-31 12:45:45 -0400 |
|---|---|---|
| committer | Sean Bright <sean.bright@gmail.com> | 2017-05-31 12:25:54 -0500 |
| commit | 001f4ddda43092d936980ebedcd9ea789e961cf5 (patch) | |
| tree | c63aad83bb69638ce41c2b391fb6f85d6a959e6e /main/pbx_builtins.c | |
| parent | f6eeaaafd507df6e2094dd201cb6897dbb63216a (diff) | |
pbx_builtin: Properly handle hangup during Background
Before this patch, when a user hung up during a Background, we would
stuff 0xff into a char and attempt a dialplan lookup of it. This caused
problems for some realtime engines which interpreted the value as the
beginning of an invalid UTF-8 sequence.
ASTERISK-19291 #close
Reported by: Andrew Nowrot
Change-Id: I8ca6da93252d61c76ebdb46a4aa65e73ca985358
Diffstat (limited to 'main/pbx_builtins.c')
| -rw-r--r-- | main/pbx_builtins.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/main/pbx_builtins.c b/main/pbx_builtins.c index 20fdb4c22..bc27b0d58 100644 --- a/main/pbx_builtins.c +++ b/main/pbx_builtins.c @@ -1111,6 +1111,13 @@ static int pbx_builtin_background(struct ast_channel *chan, const char *data) } } + /* If ast_waitstream didn't give us back a digit, there is nothing else to do */ + if (res <= 0) { + goto done; + } + + exten[0] = res; + /* * If the single digit DTMF is an extension in the specified context, then * go there and signal no DTMF. Otherwise, we should exit with that DTMF. @@ -1130,7 +1137,6 @@ static int pbx_builtin_background(struct ast_channel *chan, const char *data) * be returned (see #16434). */ if (!ast_test_flag(ast_channel_flags(chan), AST_FLAG_DISABLE_WORKAROUNDS) - && (exten[0] = res) && ast_canmatch_extension(chan, args.context, exten, 1, S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL)) && !ast_matchmore_extension(chan, args.context, exten, 1, |