[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.1? v2 3/9] util/selfmap: Discard mapping on error
From: |
Richard Henderson |
Subject: |
[PATCH for-6.1? v2 3/9] util/selfmap: Discard mapping on error |
Date: |
Sun, 25 Jul 2021 02:24:10 -1000 |
>From clang-13:
util/selfmap.c:26:21: error: variable 'errors' set but not used \
[-Werror,-Wunused-but-set-variable]
Quite right of course, but there's no reason not to check errors.
First, incrementing errors is incorrect, because qemu_strtoul
returns an errno not a count -- just or them together so that
we have a non-zero value at the end.
Second, if we have an error, do not add the struct to the list,
but free it instead.
Cc: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
util/selfmap.c | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/util/selfmap.c b/util/selfmap.c
index 2ec99dfdda..2c14f019ce 100644
--- a/util/selfmap.c
+++ b/util/selfmap.c
@@ -23,29 +23,34 @@ GSList *read_self_maps(void)
gchar **fields = g_strsplit(lines[i], " ", 6);
if (g_strv_length(fields) > 4) {
MapInfo *e = g_new0(MapInfo, 1);
- int errors;
+ int errors = 0;
const char *end;
- errors = qemu_strtoul(fields[0], &end, 16, &e->start);
- errors += qemu_strtoul(end + 1, NULL, 16, &e->end);
+ errors |= qemu_strtoul(fields[0], &end, 16, &e->start);
+ errors |= qemu_strtoul(end + 1, NULL, 16, &e->end);
e->is_read = fields[1][0] == 'r';
e->is_write = fields[1][1] == 'w';
e->is_exec = fields[1][2] == 'x';
e->is_priv = fields[1][3] == 'p';
- errors += qemu_strtoul(fields[2], NULL, 16, &e->offset);
+ errors |= qemu_strtoul(fields[2], NULL, 16, &e->offset);
e->dev = g_strdup(fields[3]);
- errors += qemu_strtou64(fields[4], NULL, 10, &e->inode);
+ errors |= qemu_strtou64(fields[4], NULL, 10, &e->inode);
- /*
- * The last field may have leading spaces which we
- * need to strip.
- */
- if (g_strv_length(fields) == 6) {
- e->path = g_strdup(g_strchug(fields[5]));
+ if (!errors) {
+ /*
+ * The last field may have leading spaces which we
+ * need to strip.
+ */
+ if (g_strv_length(fields) == 6) {
+ e->path = g_strdup(g_strchug(fields[5]));
+ }
+ map_info = g_slist_prepend(map_info, e);
+ } else {
+ g_free(e->dev);
+ g_free(e);
}
- map_info = g_slist_prepend(map_info, e);
}
g_strfreev(fields);
--
2.25.1
- [PATCH for-6.1? v2 0/9] Fixes for clang-13, Richard Henderson, 2021/07/25
- [PATCH for-6.1? v2 1/9] nbd/server: Mark variable unused in nbd_negotiate_meta_queries, Richard Henderson, 2021/07/25
- [PATCH for-6.1? v2 2/9] accel/tcg: Remove unused variable in cpu_exec, Richard Henderson, 2021/07/25
- [PATCH for-6.1? v2 4/9] net/checksum: Remove unused variable in net_checksum_add_iov, Richard Henderson, 2021/07/25
- [PATCH for-6.1? v2 3/9] util/selfmap: Discard mapping on error,
Richard Henderson <=
- [PATCH for-6.1? v2 5/9] hw/audio/adlib: Remove unused variable in adlib_callback, Richard Henderson, 2021/07/25
- [PATCH for-6.1? v2 6/9] hw/ppc/spapr_events: Remove unused variable from check_exception, Richard Henderson, 2021/07/25
- [PATCH for-6.1? v2 7/9] hw/pci-hist/pnv_phb4: Fix typo in pnv_phb4_ioda_write, Richard Henderson, 2021/07/25
- [PATCH for-6.1? v2 8/9] linux-user/syscall: Remove unused variable from execve, Richard Henderson, 2021/07/25
- [PATCH for-6.1? v2 9/9] tests/unit: Remove unused variable from test_io, Richard Henderson, 2021/07/25
- Re: [PATCH for-6.1? v2 0/9] Fixes for clang-13, Richard Henderson, 2021/07/26