summaryrefslogtreecommitdiff
path: root/apps/app_read.c
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2007-10-16 21:38:05 +0000
committerMark Michelson <mmichelson@digium.com>2007-10-16 21:38:05 +0000
commitdadfe716e2a90d0e145016f630fea3646f4f7364 (patch)
treeb31239a2a801918cc2c136ea2b2dec743a54cc0b /apps/app_read.c
parentbece7e24f23a06058b1f87b76bfc43232e486b3b (diff)
Fixing app_read so that if a timeout of less than 1 ms is specified,
assume that 1 ms is desired. (closes issue #11000, reported and patched by michael-fig, with a warning line added by me) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85965 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_read.c')
-rw-r--r--apps/app_read.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/app_read.c b/apps/app_read.c
index f7203a6a7..4422cb157 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -127,8 +127,14 @@ static int read_exec(struct ast_channel *chan, void *data)
tosec = atof(arglist.timeout);
if (tosec <= 0)
to = 0;
- else
+ else {
to = tosec * 1000.0;
+ if (to <= 0) {
+ /* Make sure we don't use the default timeout. */
+ ast_log(LOG_WARNING, "Read timeout less than 1 ms, assuming 1 ms timeout\n");
+ to = 1;
+ }
+ }
}
if (ast_strlen_zero(arglist.filename)) {