Merge pull request #487 from martin-belanger/eliminate-empty-arguments

dwsuse · web-flow · commit 2e054821cd40 · 2022-09-27T17:03:25.000+02:00
fabrics: Filter out empty strings in add_argument()
diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
@@ -295,7 +295,7 @@ static int add_argument(char **argstr, const char *tok, const char *arg)
 {
 	char *nstr;
 
-	if (!(arg && strcmp(arg, "none")))
+	if (!arg || arg[0] == '\0' || !strcmp(arg, "none"))
 		return 0;
 	if (asprintf(&nstr, "%s,%s=%s", *argstr, tok, arg) < 0) {
 		errno = ENOMEM;

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ static int add_argument(char *argstr, const char tok, const char *arg)`
`295`	`295`	`{`
`296`	`296`	`char *nstr;`
`297`	`297`
`298`		`- if (!(arg && strcmp(arg, "none")))`
	`298`	`+ if (!arg \|\| arg[0] == '\0' \|\| !strcmp(arg, "none"))`
`299`	`299`	`return 0;`
`300`	`300`	`if (asprintf(&nstr, "%s,%s=%s", *argstr, tok, arg) < 0) {`
`301`	`301`	`errno = ENOMEM;`