aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-05 17:42:36 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-05 17:42:36 +0000
commit656c0d560828b2abef4cbfe7cd61c4c8d7b7a2c7 (patch)
treeb9f83f918cf2c542f6cf3f8947658a0dafb4c052
parent97c0d518984b71ce61c37a5432ecddce05e58647 (diff)
Merged revisions 106139 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r106139 | tilghman | 2008-03-05 11:40:42 -0600 (Wed, 05 Mar 2008) | 3 lines Should check these values for non-NULL before scanning. (Closes issue #12147) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106140 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_talkdetect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 0aa5e818b..fb862440d 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -83,11 +83,11 @@ static int background_detect_exec(struct ast_channel *chan, void *data)
tmp = ast_strdupa(data);
AST_STANDARD_APP_ARGS(args, tmp);
- if ((sscanf(args.silence, "%d", &x) == 1) && (x > 0))
+ if (!ast_strlen_zero(args.silence) && (sscanf(args.silence, "%d", &x) == 1) && (x > 0))
sil = x;
- if ((sscanf(args.min, "%d", &x) == 1) && (x > 0))
+ if (!ast_strlen_zero(args.min) && (sscanf(args.min, "%d", &x) == 1) && (x > 0))
min = x;
- if ((sscanf(args.max, "%d", &x) == 1) && (x > 0))
+ if (!ast_strlen_zero(args.max) && (sscanf(args.max, "%d", &x) == 1) && (x > 0))
max = x;
ast_debug(1, "Preparing detect of '%s', sil=%d, min=%d, max=%d\n", args.filename, sil, min, max);