From b40ca38c56f2ae59b6822a2c43578a3e3c555184 Mon Sep 17 00:00:00 2001
From: Naveen Albert <asterisk@phreaknet.org>
Date: Wed, 29 Sep 2021 17:58:14 +0000
Subject: [PATCH] app_read: Fix null pointer crash
If the terminator character is not explicitly specified
and an indications tone is used for reading a digit,
there is no null pointer check so Asterisk crashes.
This prevents null usage from occuring.
ASTERISK-29673 #close
Change-Id: Ie941833e123c3dbfb88371b5de5edbbe065514ac
---
apps/app_read.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/app_read.c b/apps/app_read.c
index dd48f05e13..977b20dc29 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -154,7 +154,7 @@ static int read_exec(struct ast_channel *chan, const char *data)
struct ast_tone_zone_sound *ts = NULL;
struct ast_flags flags = {0};
const char *status = "ERROR";
- char *terminator = NULL; /* use default terminator # by default */
+ char *terminator = "#"; /* use default terminator # by default */
AST_DECLARE_APP_ARGS(arglist,
AST_APP_ARG(variable);
@@ -213,7 +213,7 @@ static int read_exec(struct ast_channel *chan, const char *data)
}
}
if (ast_test_flag(&flags, OPT_TERMINATOR)) {
- if (!ast_strlen_zero(arglist.filename)) {
+ if (!ast_strlen_zero(opt_args[OPT_ARG_TERMINATOR])) {
terminator = opt_args[OPT_ARG_TERMINATOR];
} else {
terminator = ""; /* no digit inherently will terminate input */
--
GitLab