r.watershed: use allocated buffer size as arg to snprintf (#7197)

nilason · web-flow · commit 7456ccd7a3c5 · 2026-03-19T11:54:23.000Z
diff --git a/raster/r.watershed/front/main.c b/raster/r.watershed/front/main.c
@@ -30,11 +30,13 @@ static int new_argc;
 static void do_opt(const struct Option *opt)
 {
     char *buf;
+    size_t len;
 
     if (!opt->answer)
         return;
-    buf = G_malloc(strlen(opt->key) + 1 + strlen(opt->answer) + 1);
-    snprintf(buf, GPATH_MAX, "%s=%s", opt->key, opt->answer);
+    len = strlen(opt->key) + 1 + strlen(opt->answer) + 1;
+    buf = G_malloc(len);
+    snprintf(buf, len, "%s=%s", opt->key, opt->answer);
     new_argv[new_argc++] = buf;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,13 @@ static int new_argc;`
`30`	`30`	`static void do_opt(const struct Option *opt)`
`31`	`31`	`{`
`32`	`32`	`char *buf;`
	`33`	`+ size_t len;`
`33`	`34`
`34`	`35`	`if (!opt->answer)`
`35`	`36`	`return;`
`36`		`- buf = G_malloc(strlen(opt->key) + 1 + strlen(opt->answer) + 1);`
`37`		`- snprintf(buf, GPATH_MAX, "%s=%s", opt->key, opt->answer);`
	`37`	`+ len = strlen(opt->key) + 1 + strlen(opt->answer) + 1;`
	`38`	`+ buf = G_malloc(len);`
	`39`	`+ snprintf(buf, len, "%s=%s", opt->key, opt->answer);`
`38`	`40`	`new_argv[new_argc++] = buf;`
`39`	`41`	`}`
`40`	`42`