| Message ID | ebb2ec1150da633507c2b735ca8ea1cab05ec92a.1697740364.git.quic_mathbern@quicinc.com |
|---|---|
| State | New |
| Headers | show |
| Series | semihosting: fix memleak at semihosting_arg_fallback | expand |
On 19/10/23 20:32, Matheus Tavares Bernardino wrote: > We duplicate "cmd" as strtok may modify its argument, but we forgot > to free it later. Furthermore, add_semihosting_arg doesn't take > responsibility for this memory either (it strdup's the argument). > > Signed-off-by: Matheus Tavares Bernardino <quic_mathbern@quicinc.com> > --- > semihosting/config.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/semihosting/config.c b/semihosting/config.c > index 249a377ae8..32aa210460 100644 > --- a/semihosting/config.c > +++ b/semihosting/config.c > @@ -112,17 +112,19 @@ static int add_semihosting_arg(void *opaque, > /* Use strings passed via -kernel/-append to initialize semihosting.argv[] */ > void semihosting_arg_fallback(const char *file, const char *cmd) > { > - char *cmd_token; Preferably using g_autofree: g_autofree char *cmd_dup = g_strdup(cmd); Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > + char *cmd_token, *cmd_dup; > > /* argv[0] */ > add_semihosting_arg(&semihosting, "arg", file, NULL); > > /* split -append and initialize argv[1..n] */ > - cmd_token = strtok(g_strdup(cmd), " "); > + cmd_dup = g_strdup(cmd); > + cmd_token = strtok(cmd_dup, " "); > while (cmd_token) { > add_semihosting_arg(&semihosting, "arg", cmd_token, NULL); > cmd_token = strtok(NULL, " "); > } > + g_free(cmd_dup); > } > > void qemu_semihosting_enable(void)
diff --git a/semihosting/config.c b/semihosting/config.c index 249a377ae8..32aa210460 100644 --- a/semihosting/config.c +++ b/semihosting/config.c @@ -112,17 +112,19 @@ static int add_semihosting_arg(void *opaque, /* Use strings passed via -kernel/-append to initialize semihosting.argv[] */ void semihosting_arg_fallback(const char *file, const char *cmd) { - char *cmd_token; + char *cmd_token, *cmd_dup; /* argv[0] */ add_semihosting_arg(&semihosting, "arg", file, NULL); /* split -append and initialize argv[1..n] */ - cmd_token = strtok(g_strdup(cmd), " "); + cmd_dup = g_strdup(cmd); + cmd_token = strtok(cmd_dup, " "); while (cmd_token) { add_semihosting_arg(&semihosting, "arg", cmd_token, NULL); cmd_token = strtok(NULL, " "); } + g_free(cmd_dup); } void qemu_semihosting_enable(void)
We duplicate "cmd" as strtok may modify its argument, but we forgot to free it later. Furthermore, add_semihosting_arg doesn't take responsibility for this memory either (it strdup's the argument). Signed-off-by: Matheus Tavares Bernardino <quic_mathbern@quicinc.com> --- semihosting/config.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)