nil checks in command code

bosun-monitor · Sep 19, 2015 · 4a03e8d · 4a03e8d · kylebrandt · Sep 19, 2015
1 parent a9be86b
commit 4a03e8d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/util/command.go b/util/command.go
@@ -47,10 +47,13 @@ func Command(timeout time.Duration, stdin io.Reader, name string, arg ...string)
 		case err := <-done:
 			return &b, err
 		case <-interrupt:
-			c.Process.Signal(os.Interrupt)
+			if c.Process != nil {
+				c.Process.Signal(os.Interrupt)
+			}
 		case <-kill:
-			// todo: figure out if this can leave the done chan hanging open
-			c.Process.Kill()
+			if c.Process != nil {
+				c.Process.Kill()
+			}
 			return nil, ErrTimeout
 		}
 	}