From 49caf07ba6921c31334b47f0262591f287057c6a Mon Sep 17 00:00:00 2001 From: Pavel Vorobyov Date: Thu, 26 Mar 2020 12:35:58 +0300 Subject: [PATCH] negative delays and delay int size fixed --- cli/handlers.go | 8 ++++++-- config/config.go | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cli/handlers.go b/cli/handlers.go index 4444628..0e4d08b 100644 --- a/cli/handlers.go +++ b/cli/handlers.go @@ -273,14 +273,18 @@ func (c *Cli) doAlias(name string, argsLine string, args ...string) { func (c *Cli) doDelay(name string, argsLine string, args ...string) { if len(args) < 1 { - term.Errorf("Usage: delay \n") + term.Warnf("Current delay value: %d\n", c.delay) return } - sec, err := strconv.ParseInt(args[0], 10, 8) + sec, err := strconv.ParseInt(args[0], 10, 32) if err != nil { term.Errorf("Invalid delay format: %s\n", err) return } + if sec < 0 { + term.Errorf("Invalid delay format: delay can't be negative\n") + return + } c.delay = int(sec) } diff --git a/config/config.go b/config/config.go index a9bd9ad..11ea826 100644 --- a/config/config.go +++ b/config/config.go @@ -224,7 +224,7 @@ func read(filename string, secondPass bool) (*XCConfig, error) { cfg.SSHConnectTimeout = ctimeout delay, err := props.GetInt("executer.delay") - if err != nil { + if err != nil || delay < 0 { delay = defaultDelay } cfg.Delay = delay