All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 5/8] semihosting: clean up handling of expanded argv
Date: Wed, 23 Mar 2022 11:27:08 +0000	[thread overview]
Message-ID: <20220323112711.440376-6-alex.bennee@linaro.org> (raw)
In-Reply-To: <20220323112711.440376-1-alex.bennee@linaro.org>

Another cleanup patch tripped over the fact we weren't being careful
in our casting. Fix the casts, allow for a non-const and switch from
g_realloc to g_renew.

The whole semihosting argument handling could do with some tests
though.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220315121251.2280317-8-alex.bennee@linaro.org>

diff --git a/semihosting/config.c b/semihosting/config.c
index 137171b717..50d82108e6 100644
--- a/semihosting/config.c
+++ b/semihosting/config.c
@@ -51,7 +51,7 @@ typedef struct SemihostingConfig {
     bool enabled;
     SemihostingTarget target;
     Chardev *chardev;
-    const char **argv;
+    char **argv;
     int argc;
     const char *cmdline; /* concatenated argv */
 } SemihostingConfig;
@@ -98,8 +98,8 @@ static int add_semihosting_arg(void *opaque,
     if (strcmp(name, "arg") == 0) {
         s->argc++;
         /* one extra element as g_strjoinv() expects NULL-terminated array */
-        s->argv = g_realloc(s->argv, (s->argc + 1) * sizeof(void *));
-        s->argv[s->argc - 1] = val;
+        s->argv = g_renew(char *, s->argv, s->argc + 1);
+        s->argv[s->argc - 1] = g_strdup(val);
         s->argv[s->argc] = NULL;
     }
     return 0;
-- 
2.30.2



  parent reply	other threads:[~2022-03-23 11:38 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-23 11:27 [PULL for 7.0 0/8] i386, docs, gitlab fixes Alex Bennée
2022-03-23 11:27 ` [PULL 1/8] tests/Makefile.include: Let "make clean" remove the TCG tests, too Alex Bennée
2022-03-23 11:27 ` [PULL 2/8] target/i386: force maximum rounding precision for fildl[l] Alex Bennée
2022-03-23 11:27 ` [PULL 3/8] mailmap/gitdm: more fixes for bad tags and authors Alex Bennée
2022-03-23 11:27 ` [PULL 4/8] docs/devel: try and impose some organisation Alex Bennée
2022-03-23 11:27 ` Alex Bennée [this message]
2022-03-23 11:27 ` [PULL 6/8] gitlab: include new aarch32 job in custom-runners Alex Bennée
2022-03-23 11:27 ` [PULL 7/8] docs: remove qemu_logo.pdf Alex Bennée
2022-03-23 11:27 ` [PULL 8/8] docs/tcg-plugins: document QEMU_PLUGIN behaviour Alex Bennée
2022-03-23 18:05 ` [PULL for 7.0 0/8] i386, docs, gitlab fixes Peter Maydell
2022-03-23 19:04   ` Alex Bennée
2022-03-24 11:00     ` Peter Maydell
2022-03-24 16:32 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220323112711.440376-6-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=f4bug@amsat.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.