From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, qemu-ppc@nongnu.org, qemu-arm@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@redhat.com> Subject: [PATCH v2 6/9] gdbstub: Only call cmd_parse_params() with non-NULL command schema Date: Thu, 6 May 2021 15:37:55 +0200 [thread overview] Message-ID: <20210506133758.1749233-7-philmd@redhat.com> (raw) In-Reply-To: <20210506133758.1749233-1-philmd@redhat.com> Move the NULL check on command schema buffer from the callee cmd_parse_params() to the single caller, process_string_cmd(). This simplifies the process_string_cmd() logic. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- gdbstub.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 83d47c67325..7cee2fb0f1f 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1368,12 +1368,9 @@ static int cmd_parse_params(const char *data, const char *schema, int curr_param; const char *curr_schema, *curr_data; + assert(schema); *num_params = 0; - if (!schema) { - return 0; - } - curr_schema = schema; curr_param = 0; curr_data = data; @@ -1471,7 +1468,7 @@ static inline int startswith(const char *string, const char *pattern) static int process_string_cmd(void *user_ctx, const char *data, const GdbCmdParseEntry *cmds, int num_cmds) { - int i, schema_len, max_num_params = 0; + int i; GdbCmdContext gdb_ctx; if (!cmds) { @@ -1488,21 +1485,21 @@ static int process_string_cmd(void *user_ctx, const char *data, } if (cmd->schema) { - schema_len = strlen(cmd->schema); + int schema_len = strlen(cmd->schema); + int max_num_params = schema_len / 2; + if (schema_len % 2) { return -2; } - max_num_params = schema_len / 2; - } + gdb_ctx.params = (GdbCmdVariant *)alloca(sizeof(*gdb_ctx.params) + * max_num_params); + memset(gdb_ctx.params, 0, sizeof(*gdb_ctx.params) * max_num_params); - gdb_ctx.params = - (GdbCmdVariant *)alloca(sizeof(*gdb_ctx.params) * max_num_params); - memset(gdb_ctx.params, 0, sizeof(*gdb_ctx.params) * max_num_params); - - if (cmd_parse_params(&data[strlen(cmd->cmd)], cmd->schema, - gdb_ctx.params, &gdb_ctx.num_params)) { - return -1; + if (cmd_parse_params(&data[strlen(cmd->cmd)], cmd->schema, + gdb_ctx.params, &gdb_ctx.num_params)) { + return -1; + } } cmd->handler(&gdb_ctx, user_ctx); -- 2.26.3
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org> Subject: [PATCH v2 6/9] gdbstub: Only call cmd_parse_params() with non-NULL command schema Date: Thu, 6 May 2021 15:37:55 +0200 [thread overview] Message-ID: <20210506133758.1749233-7-philmd@redhat.com> (raw) In-Reply-To: <20210506133758.1749233-1-philmd@redhat.com> Move the NULL check on command schema buffer from the callee cmd_parse_params() to the single caller, process_string_cmd(). This simplifies the process_string_cmd() logic. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- gdbstub.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 83d47c67325..7cee2fb0f1f 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1368,12 +1368,9 @@ static int cmd_parse_params(const char *data, const char *schema, int curr_param; const char *curr_schema, *curr_data; + assert(schema); *num_params = 0; - if (!schema) { - return 0; - } - curr_schema = schema; curr_param = 0; curr_data = data; @@ -1471,7 +1468,7 @@ static inline int startswith(const char *string, const char *pattern) static int process_string_cmd(void *user_ctx, const char *data, const GdbCmdParseEntry *cmds, int num_cmds) { - int i, schema_len, max_num_params = 0; + int i; GdbCmdContext gdb_ctx; if (!cmds) { @@ -1488,21 +1485,21 @@ static int process_string_cmd(void *user_ctx, const char *data, } if (cmd->schema) { - schema_len = strlen(cmd->schema); + int schema_len = strlen(cmd->schema); + int max_num_params = schema_len / 2; + if (schema_len % 2) { return -2; } - max_num_params = schema_len / 2; - } + gdb_ctx.params = (GdbCmdVariant *)alloca(sizeof(*gdb_ctx.params) + * max_num_params); + memset(gdb_ctx.params, 0, sizeof(*gdb_ctx.params) * max_num_params); - gdb_ctx.params = - (GdbCmdVariant *)alloca(sizeof(*gdb_ctx.params) * max_num_params); - memset(gdb_ctx.params, 0, sizeof(*gdb_ctx.params) * max_num_params); - - if (cmd_parse_params(&data[strlen(cmd->cmd)], cmd->schema, - gdb_ctx.params, &gdb_ctx.num_params)) { - return -1; + if (cmd_parse_params(&data[strlen(cmd->cmd)], cmd->schema, + gdb_ctx.params, &gdb_ctx.num_params)) { + return -1; + } } cmd->handler(&gdb_ctx, user_ctx); -- 2.26.3
next prev parent reply other threads:[~2021-05-06 13:38 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-06 13:37 [PATCH v2 0/9] misc: Replace alloca() by g_malloc() Philippe Mathieu-Daudé 2021-05-06 13:37 ` Philippe Mathieu-Daudé 2021-05-06 13:37 ` [PATCH v2 1/9] audio/alsaaudio: Replace ALSA alloca() by malloc() equivalent Philippe Mathieu-Daudé 2021-05-06 13:37 ` Philippe Mathieu-Daudé 2021-05-06 13:37 ` [PATCH v2 2/9] backends/tpm: Replace qemu_mutex_lock calls with QEMU_LOCK_GUARD Philippe Mathieu-Daudé 2021-05-06 13:37 ` Philippe Mathieu-Daudé 2021-05-06 14:46 ` Stefan Berger 2021-05-06 15:07 ` Christophe de Dinechin 2021-05-06 15:07 ` Christophe de Dinechin 2021-05-06 13:37 ` [PATCH v2 3/9] backends/tpm: Replace g_alloca() by g_malloc() Philippe Mathieu-Daudé 2021-05-06 13:37 ` Philippe Mathieu-Daudé 2021-05-06 14:46 ` Stefan Berger 2021-05-06 14:46 ` Stefan Berger 2021-05-06 13:37 ` [PATCH v2 4/9] bsd-user/syscall: Replace alloca() by g_new() Philippe Mathieu-Daudé 2021-05-06 13:37 ` Philippe Mathieu-Daudé 2021-05-06 14:16 ` Warner Losh 2021-05-06 14:20 ` Peter Maydell 2021-05-06 14:20 ` Peter Maydell 2021-05-06 14:48 ` Warner Losh 2021-05-06 14:57 ` Philippe Mathieu-Daudé 2021-05-06 15:07 ` Warner Losh 2021-05-06 14:25 ` Eric Blake 2021-05-06 14:55 ` Warner Losh 2021-05-06 15:12 ` Eric Blake 2021-05-06 15:12 ` Eric Blake 2021-05-06 15:30 ` Warner Losh 2021-05-06 15:42 ` Eric Blake 2021-05-06 15:42 ` Eric Blake 2021-05-06 16:03 ` Peter Maydell 2021-05-06 16:03 ` Peter Maydell 2021-05-06 16:09 ` Warner Losh 2021-05-06 15:58 ` Peter Maydell 2021-05-06 15:58 ` Peter Maydell 2021-05-06 16:08 ` Warner Losh 2021-05-06 13:37 ` [PATCH v2 5/9] gdbstub: Constify GdbCmdParseEntry Philippe Mathieu-Daudé 2021-05-06 13:37 ` Philippe Mathieu-Daudé 2021-05-06 13:37 ` Philippe Mathieu-Daudé [this message] 2021-05-06 13:37 ` [PATCH v2 6/9] gdbstub: Only call cmd_parse_params() with non-NULL command schema Philippe Mathieu-Daudé 2021-05-06 19:21 ` Alex Bennée 2021-05-06 19:21 ` Alex Bennée 2021-05-06 13:37 ` [PATCH v2 7/9] gdbstub: Replace alloca() + memset(0) by g_new0() Philippe Mathieu-Daudé 2021-05-06 13:37 ` Philippe Mathieu-Daudé 2021-05-06 19:22 ` Alex Bennée 2021-05-06 19:22 ` Alex Bennée 2021-05-06 13:37 ` [PATCH v2 8/9] hw/misc/pca9552: Replace g_newa() by g_new() Philippe Mathieu-Daudé 2021-05-06 13:37 ` Philippe Mathieu-Daudé 2021-05-06 13:37 ` [PATCH v2 9/9] target/ppc/kvm: Replace alloca() by g_malloc() Philippe Mathieu-Daudé 2021-05-06 13:37 ` Philippe Mathieu-Daudé 2021-05-06 14:45 ` Greg Kurz 2021-05-06 14:45 ` Greg Kurz 2021-05-07 1:05 ` David Gibson 2021-05-07 1:05 ` David Gibson 2021-05-06 14:22 ` [PATCH v2 0/9] misc: " Warner Losh 2021-05-06 14:28 ` Eric Blake 2021-05-06 15:02 ` Warner Losh
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=20210506133758.1749233-7-philmd@redhat.com \ --to=philmd@redhat.com \ --cc=alex.bennee@linaro.org \ --cc=kraxel@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=pbonzini@redhat.com \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@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: linkBe 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.