[svn-commits] tilghman: branch 1.6.0 r106140 - in /branches/1.6.0: ./ apps/app_talkdetect.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Mar  5 11:42:36 2008
New Revision: 106140

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106140
Log:
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)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_talkdetect.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Wed Mar  5 11:42:36 2008
@@ -1,1 +1,1 @@
-/trunk:1-105595,106036,106040
+/trunk:1-105595,106036,106040,106139

Modified: branches/1.6.0/apps/app_talkdetect.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_talkdetect.c?view=diff&rev=106140&r1=106139&r2=106140
==============================================================================
--- branches/1.6.0/apps/app_talkdetect.c (original)
+++ branches/1.6.0/apps/app_talkdetect.c Wed Mar  5 11:42:36 2008
@@ -83,11 +83,11 @@
 	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);