Merge PR #4919: Fix GetConfirmation User Input Bug

haasted · alexanderbez · commit 91b53f269868 · 2019-08-19T09:22:07.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -78,6 +78,7 @@ longer panics if the store to load contains substores that we didn't explicitly
 * (cli) [\#4763](https://github.com/cosmos/cosmos-sdk/issues/4763) Fix flag `--min-self-delegation` for staking `EditValidator`
 * (keys) Fix ledger custom coin type support bug
 * (simulation) [\#4912](https://github.com/cosmos/cosmos-sdk/issues/4912) Fix SimApp ModuleAccountAddrs to properly return black listed addresses for bank keeper initialization
+* (cli) [\#4919](https://github.com/cosmos/cosmos-sdk/pull/4919) Don't crash cli if user doesn't answer y/n confirmation request
 
 ## [v0.36.0] - 2019-08-13
 
diff --git a/client/input/input.go b/client/input/input.go
@@ -74,7 +74,12 @@ func GetConfirmation(prompt string, buf *bufio.Reader) (bool, error) {
 		return false, err
 	}
 
-	response = strings.ToLower(strings.TrimSpace(response))
+	response = strings.TrimSpace(response)
+	if len(response) == 0 {
+		return false, nil
+	}
+
+	response = strings.ToLower(response)
 	if response[0] == 'y' {
 		return true, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,12 @@ func GetConfirmation(prompt string, buf *bufio.Reader) (bool, error) {`
`74`	`74`	`return false, err`
`75`	`75`	`}`
`76`	`76`
`77`		`- response = strings.ToLower(strings.TrimSpace(response))`
	`77`	`+ response = strings.TrimSpace(response)`
	`78`	`+ if len(response) == 0 {`
	`79`	`+ return false, nil`
	`80`	`+ }`
	`81`	`+`
	`82`	`+ response = strings.ToLower(response)`
`78`	`83`	`if response[0] == 'y' {`
`79`	`84`	`return true, nil`
`80`	`85`	`}`