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

app_read: Fix custom terminator functionality regression

Browse Source 
Currently, when the t option is specified with no arguments,
the # character is still treated as a terminator, even though
no character should be treated as a terminator.

This is because a previous regression fix was modified to
remove the use of NULL as a default altogether. However,
NULL and an empty string actually refer to different
arrangements and should be treated differently. NULL is the
default terminator (#), while an empty string removes the
terminator altogether. This is the behavior being used by
the rest of the core.

Additionally, since S_OR catches empty strings as well as
NULL (not intended), this is changed to a ternary operator
instead, which fixes the behavior.

ASTERISK-29705 #close

Change-Id: I9b6b72196dd04f5b1e0ab5aa1b0adf627725e086
This commit is contained in:
Naveen Albert
2021-10-25 17:51:50 +00:00
committed by Kevin Harwell
parent b2256ea993
commit 45c132a375
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_read.c
View File

@@ -250,7 +250,7 @@ static int read_exec(struct ast_channel *chan, const char *data)
break;
}
tmp[x++] = res;
if (strchr(terminator, tmp[x-1])) {
if (terminator && strchr(terminator, tmp[x-1])) {
tmp[x-1] = '\0';
status = "OK";
break;

2
main/app.c
View File

@@ -249,7 +249,7 @@ enum ast_getdata_result ast_app_getdata_terminator(struct ast_channel *c, const
fto = 50;
to = ast_channel_pbx(c) ? ast_channel_pbx(c)->dtimeoutms : 2000;
}
res = ast_readstring(c, s, maxlen, to, fto, S_OR(terminator, "#"));
res = ast_readstring(c, s, maxlen, to, fto, (terminator ? terminator : "#"));
if (res == AST_GETDATA_EMPTY_END_TERMINATED) {
return res;
}