[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/12] qga-win: Fix guest-get-devices error API violations
From: |
Michael Roth |
Subject: |
[PULL 03/12] qga-win: Fix guest-get-devices error API violations |
Date: |
Tue, 27 Oct 2020 00:53:08 -0500 |
From: Markus Armbruster <armbru@redhat.com>
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.
qmp_guest_get_devices() is wrong that way: it calls error_setg() in a
loop.
If no iteration fails, the function returns a value and sets no error.
Okay.
If exactly one iteration fails, the function returns a value and sets
an error. Wrong.
If multiple iterations fail, the function trips error_setv()'s
assertion.
Fix it to return immediately on error.
Perhaps the failure to convert the driver version to UTF-8 should not
be an error. We could simply not report the botched version string
instead.
Drop a superfluous continue while there.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael Roth <michael.roth@amd.com>
---
qga/commands-win32.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index b01616a992..1efe3ba076 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -2385,7 +2385,7 @@ GuestDeviceInfoList *qmp_guest_get_devices(Error **errp)
device->driver_name = g_utf16_to_utf8(name, -1, NULL, NULL, NULL);
if (device->driver_name == NULL) {
error_setg(errp, "conversion to utf8 failed (driver name)");
- continue;
+ return NULL;
}
slog("querying device: %s", device->driver_name);
hw_ids = ga_get_hardware_ids(dev_info_data.DevInst);
@@ -2428,7 +2428,7 @@ GuestDeviceInfoList *qmp_guest_get_devices(Error **errp)
NULL, NULL);
if (device->driver_version == NULL) {
error_setg(errp, "conversion to utf8 failed (driver version)");
- continue;
+ return NULL;
}
device->has_driver_version = true;
@@ -2452,7 +2452,6 @@ GuestDeviceInfoList *qmp_guest_get_devices(Error **errp)
cur_item->next = item;
cur_item = item;
}
- continue;
}
if (dev_info != INVALID_HANDLE_VALUE) {
--
2.25.1
- [PULL 00/12] qemu-ga patch queue for soft-freeze, Michael Roth, 2020/10/27
- [PULL 10/12] qga: add *reset argument to ssh-add-authorized-keys, Michael Roth, 2020/10/27
- [PULL 11/12] meson: minor simplification, Michael Roth, 2020/10/27
- [PULL 12/12] qga: add ssh-get-authorized-keys, Michael Roth, 2020/10/27
- [PULL 01/12] qga: Rename guest-get-devices return member 'address' to 'id', Michael Roth, 2020/10/27
- [PULL 02/12] qga: Use common time encoding for guest-get-devices 'driver-date', Michael Roth, 2020/10/27
- [PULL 03/12] qga-win: Fix guest-get-devices error API violations,
Michael Roth <=
- [PULL 05/12] qga: add command guest-get-disks, Michael Roth, 2020/10/27
- [PULL 04/12] qga: Flatten simple union GuestDeviceId, Michael Roth, 2020/10/27
- [PULL 06/12] qga: add implementation of guest-get-disks for Linux, Michael Roth, 2020/10/27
- [PULL 07/12] qga: add implementation of guest-get-disks for Windows, Michael Roth, 2020/10/27
- [PULL 08/12] glib-compat: add g_unix_get_passwd_entry_qemu(), Michael Roth, 2020/10/27
- [PULL 09/12] qga: add ssh-{add,remove}-authorized-keys, Michael Roth, 2020/10/27
- Re: [PULL 00/12] qemu-ga patch queue for soft-freeze, no-reply, 2020/10/27
- Re: [PULL 00/12] qemu-ga patch queue for soft-freeze, Peter Maydell, 2020/10/28