From 167f52587173ad87aac7780058d59aa96422eed0 Mon Sep 17 00:00:00 2001 From: Andreas Fenkart Date: Wed, 9 Dec 2015 13:13:21 +0100 Subject: tools: env validate: pass values as 0-based array passing argv/argc can produce off-by-one errors Signed-off-by: Andreas Fenkart --- tools/env/fw_env.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 39f733376e..8c452a8693 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -498,8 +498,9 @@ int fw_setenv(int argc, char *argv[]) { int i, rc; size_t len; - char *name; + char *name, **valv; char *value = NULL; + int valc; #ifdef CONFIG_FILE if (argc >= 2 && strcmp(argv[1], "-c") == 0) { @@ -543,13 +544,15 @@ int fw_setenv(int argc, char *argv[]) } name = argv[1]; + valv = argv + 2; + valc = argc - 2; - if (env_flags_validate_env_set_params(argc, argv) < 0) + if (env_flags_validate_env_set_params(name, valv, valc) < 0) return 1; len = 0; - for (i = 2; i < argc; ++i) { - char *val = argv[i]; + for (i = 0; i < valc; ++i) { + char *val = valv[i]; size_t val_len = strlen(val); if (value) -- cgit v1.2.3