summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-12-19 16:10:43 +0000
committerWolfgang Denk <wd@denx.de>2011-12-20 23:12:32 +0100
commit38bd80b4856254916e886488f8e455e3bc15fdbe (patch)
tree0ff9a38e5f760f1c8e7ca44d80818254744bcccc
parentbf0b6313433819899c49d8d6fb30b4d702226f1e (diff)
net: Fix arguments in tftpput command
The switch to strict_strtoul() was not done correctly - this fixes the compile error when CONFIG_CMD_TFTPPUT is active. There appears to very little use of strict_strtoul() in commands, so it might be easier to switch to simple_strtoul(). If not, we should decide the best way to use strict_strtoul(). For now I have added a friendly message which will of course increase code size. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/cmd_net.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/common/cmd_net.c b/common/cmd_net.c
index f89a24bfd4..89519faad3 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -221,8 +221,11 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
#ifdef CONFIG_CMD_TFTPPUT
case 4:
- save_addr = strict_strtoul(argv[1], NULL, 16);
- save_size = strict_strtoul(argv[2], NULL, 16);
+ if (strict_strtoul(argv[1], 16, &save_addr) < 0 ||
+ strict_strtoul(argv[2], 16, &save_size) < 0) {
+ printf("Invalid address/size\n");
+ return cmd_usage(cmdtp);
+ }
copy_filename(BootFile, argv[3], sizeof(BootFile));
break;
#endif