From: Simon Glass <sjg@chromium.org>
Date: Sun, 24 Feb 2013 17:33:11 +0000 (+0000)
Subject: Tidy up error checking and fix bug in hash command
X-Git-Tag: v2013.04-rc1~16^2~21
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6b3ff98da41a084658877282057adeb59ff6e9f2;p=oweals%2Fu-boot.git

Tidy up error checking and fix bug in hash command

There are two problems:

1. The argument count needs to be checked before argv is used
2. When verify is not enabled, we need to define a constant zero value

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/cmd_hash.c b/common/cmd_hash.c
index 689c608572..eb6a33873b 100644
--- a/common/cmd_hash.c
+++ b/common/cmd_hash.c
@@ -32,11 +32,15 @@ static int do_hash(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #ifdef CONFIG_HASH_VERIFY
 	int verify = 0;
 
+	if (argc < 4)
+		return CMD_RET_USAGE;
 	if (!strcmp(argv[1], "-v")) {
 		verify = 1;
 		argc--;
 		argv++;
 	}
+#else
+	const int verify = 0;
 #endif
 	/* Move forward to 'algorithm' parameter */
 	argc--;