From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 3 Jul 2007 12:40:26 +0000 (+0000)
Subject: Merged revisions 73053 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b93f50dfc57aabbf5249620a9d736b80d3ab4de;p=thirdparty%2Fasterisk.git

Merged revisions 73053 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r73053 | tilghman | 2007-07-03 07:38:53 -0500 (Tue, 03 Jul 2007) | 10 lines

Merged revisions 73052 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r73052 | tilghman | 2007-07-03 07:34:14 -0500 (Tue, 03 Jul 2007) | 2 lines

RetryDial should accept a 0 argument, but it does not, because atoi does not distinguish between 0 and error (closes issue #10106)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 035604e678..e566f58a3c 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1846,7 +1846,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
 
 	if ((dialdata = strchr(announce, '|'))) {
 		*dialdata++ = '\0';
-		if ((sleep = atoi(dialdata))) {
+		if (sscanf(dialdata, "%d", &sleep) == 1) {
 			sleep *= 1000;
 		} else {
 			ast_log(LOG_ERROR, "%s requires the numerical argument <sleep>\n",rapp);
@@ -1854,7 +1854,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
 		}
 		if ((dialdata = strchr(dialdata, '|'))) {
 			*dialdata++ = '\0';
-			if (!(loops = atoi(dialdata))) {
+			if (sscanf(dialdata, "%d", &loops) != 1) {
 				ast_log(LOG_ERROR, "%s requires the numerical argument <loops>\n",rapp);
 				goto done;
 			}