[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 30/38] gdbstub: clean-up vcont handling to avoid goto
From: |
Alex Bennée |
Subject: |
[PATCH v4 30/38] gdbstub: clean-up vcont handling to avoid goto |
Date: |
Fri, 30 Jun 2023 19:04:15 +0100 |
We can handle all the error exit cases by using g_autofree() for the
one thing that needs cleaning up on the exit.
Message-Id: <20230627160943.2956928-29-alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
gdbstub/gdbstub.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c
index 9496d7b175..49143c7d83 100644
--- a/gdbstub/gdbstub.c
+++ b/gdbstub/gdbstub.c
@@ -573,7 +573,6 @@ static int gdb_handle_vcont(const char *p)
{
int res, signal = 0;
char cur_action;
- char *newstates;
unsigned long tmp;
uint32_t pid, tid;
GDBProcess *process;
@@ -581,7 +580,7 @@ static int gdb_handle_vcont(const char *p)
GDBThreadIdKind kind;
unsigned int max_cpus = gdb_get_max_cpus();
/* uninitialised CPUs stay 0 */
- newstates = g_new0(char, max_cpus);
+ g_autofree char *newstates = g_new0(char, max_cpus);
/* mark valid CPUs with 1 */
CPU_FOREACH(cpu) {
@@ -597,8 +596,7 @@ static int gdb_handle_vcont(const char *p)
res = 0;
while (*p) {
if (*p++ != ';') {
- res = -ENOTSUP;
- goto out;
+ return -ENOTSUP;
}
cur_action = *p++;
@@ -606,13 +604,12 @@ static int gdb_handle_vcont(const char *p)
cur_action = qemu_tolower(cur_action);
res = qemu_strtoul(p, &p, 16, &tmp);
if (res) {
- goto out;
+ return res;
}
signal = gdb_signal_to_target(tmp);
} else if (cur_action != 'c' && cur_action != 's') {
/* unknown/invalid/unsupported command */
- res = -ENOTSUP;
- goto out;
+ return -ENOTSUP;
}
if (*p == '\0' || *p == ';') {
@@ -625,14 +622,12 @@ static int gdb_handle_vcont(const char *p)
} else if (*p++ == ':') {
kind = read_thread_id(p, &p, &pid, &tid);
} else {
- res = -ENOTSUP;
- goto out;
+ return -ENOTSUP;
}
switch (kind) {
case GDB_READ_THREAD_ERR:
- res = -EINVAL;
- goto out;
+ return -EINVAL;
case GDB_ALL_PROCESSES:
cpu = gdb_first_attached_cpu();
@@ -649,8 +644,7 @@ static int gdb_handle_vcont(const char *p)
process = gdb_get_process(pid);
if (!process->attached) {
- res = -EINVAL;
- goto out;
+ return -EINVAL;
}
cpu = get_first_cpu_in_process(process);
@@ -668,8 +662,7 @@ static int gdb_handle_vcont(const char *p)
/* invalid CPU/thread specified */
if (!cpu) {
- res = -EINVAL;
- goto out;
+ return -EINVAL;
}
/* only use if no previous match occourred */
@@ -679,12 +672,9 @@ static int gdb_handle_vcont(const char *p)
break;
}
}
+
gdbserver_state.signal = signal;
gdb_continue_partial(newstates);
-
-out:
- g_free(newstates);
-
return res;
}
--
2.39.2
- [PATCH v4 08/38] tests/qtests: clean-up and fix leak in generic_fuzz, (continued)
- [PATCH v4 08/38] tests/qtests: clean-up and fix leak in generic_fuzz, Alex Bennée, 2023/06/30
- [PATCH v4 09/38] tests/docker: add test-fuzz, Alex Bennée, 2023/06/30
- [PATCH v4 05/38] tests/tcg: add mechanism to handle plugin arguments, Alex Bennée, 2023/06/30
- [PATCH v4 06/38] qemu-keymap: properly check return from xkb_keymap_mod_get_index, Alex Bennée, 2023/06/30
- [PATCH v4 07/38] scripts/oss-fuzz: add a suppression for keymap, Alex Bennée, 2023/06/30
- [PATCH v4 12/38] tests/lcitool: Bump fedora container versions, Alex Bennée, 2023/06/30
- [PATCH v4 11/38] tests/lcitool: update to latest version, Alex Bennée, 2023/06/30
- [PATCH v4 38/38] tests/tcg: Add a test for info proc mappings, Alex Bennée, 2023/06/30
- [PATCH v4 14/38] tests/lcitool: introduce qemu-minimal, Alex Bennée, 2023/06/30
- [PATCH v4 13/38] tests/lcitool: add an explicit gcc-native package, Alex Bennée, 2023/06/30
- [PATCH v4 30/38] gdbstub: clean-up vcont handling to avoid goto,
Alex Bennée <=
- [PATCH v4 32/38] linux-user: Add "safe" parameter to do_guest_openat(), Alex Bennée, 2023/06/30
- [PATCH v4 20/38] plugins: fix memory leak while parsing options, Alex Bennée, 2023/06/30
- [PATCH v4 37/38] docs: Document security implications of debugging, Alex Bennée, 2023/06/30
- [PATCH v4 28/38] gdbstub: lightly refactor connection to avoid snprintf, Alex Bennée, 2023/06/30
- [PATCH v4 26/38] docs/devel: split qom-api reference into new file, Alex Bennée, 2023/06/30
- [PATCH v4 27/38] docs/devel: introduce some key concepts for QOM development, Alex Bennée, 2023/06/30
- [PATCH v4 21/38] plugins: update lockstep to use g_memdup2, Alex Bennée, 2023/06/30
- [PATCH v4 36/38] gdbstub: Add support for info proc mappings, Alex Bennée, 2023/06/30
- [PATCH v4 33/38] linux-user: Emulate /proc/self/smaps, Alex Bennée, 2023/06/30
- [PATCH v4 34/38] gdbstub: Expose gdb_get_process() and gdb_get_first_cpu_in_process(), Alex Bennée, 2023/06/30