]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 181612 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 12 Mar 2009 13:28:39 +0000 (13:28 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 12 Mar 2009 13:28:39 +0000 (13:28 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

........
  r181612 | file | 2009-03-12 10:24:12 -0300 (Thu, 12 Mar 2009) | 5 lines

  Fix crash when sleep and retries argument was not given to RetryDial application.

  (closes issue #14647)
  Reported by: sherpya
........

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

apps/app_dial.c

index 26cc8b4a4b6af275a112e6d9a5c19db0d48cb58c..b2a31bf5644711efbf6fee43fe0406b3f41c35af 100644 (file)
@@ -2051,10 +2051,12 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
        parse = ast_strdupa(data);
        AST_STANDARD_APP_ARGS(args, parse);
 
-       if ((sleepms = atoi(args.sleep)))
+       if (!ast_strlen_zero(args.sleep) && (sleepms = atoi(args.sleep)))
                sleepms *= 1000;
 
-       loops = atoi(args.retries);
+       if (!ast_strlen_zero(args.retries)) {
+               loops = atoi(args.retries);
+       }
 
        if (!args.dialdata) {
                ast_log(LOG_ERROR, "%s requires a 4th argument (dialdata)\n", rapp);