Merge pull request #2503 from pacovn/Coverity_1469898_Uninitialized_scalar_variable

lib: uninitialized variable (2) (Coverity 1469898)

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/command.c b/lib/command.c
index 4d88f295a3..0bf856f248 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -261,8 +261,11 @@ void print_version(const char *progname)
 
 char *argv_concat(struct cmd_token **argv, int argc, int shift)
 {
-	int cnt = argc - shift;
-	const char *argstr[cnt];
+	int cnt = MAX(argc - shift, 0);
+	const char *argstr[cnt + 1];
+
+	if (!cnt)
+		return NULL;
 
 	for (int i = 0; i < cnt; i++)
 		argstr[i] = argv[i + shift]->arg;