fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2025-12-20 12:30:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

up-tool: Catch NULL return for more upower API calls

Browse source 
This can lead to crashes if the communication with the daemon fails.

See https://bugzilla.redhat.com/show_bug.cgi?id=1922777
This commit is contained in:
Benjamin Berg 2021-02-01 12:11:00 +01:00 • committed by Bastien Nocera
parent 4b96535023
commit 706dcd44e4
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/up-tool.c
View file

@ -315,6 +315,10 @@ main (int argc, char **argv)
if (opt_enumerate || opt_dump) { if (opt_enumerate || opt_dump) {
GPtrArray *devices; GPtrArray *devices;
devices = up_client_get_devices2 (client); devices = up_client_get_devices2 (client);
if (!devices) {
g_print ("Failed to get device list\n");
goto out;
}
for (i=0; i < devices->len; i++) { for (i=0; i < devices->len; i++) {
device = (UpDevice*) g_ptr_array_index (devices, i); device = (UpDevice*) g_ptr_array_index (devices, i);
if (opt_enumerate) { if (opt_enumerate) {
@ -328,6 +332,10 @@ main (int argc, char **argv)
} }
g_ptr_array_unref (devices); g_ptr_array_unref (devices);
device = up_client_get_display_device (client); device = up_client_get_display_device (client);
if (!device) {
g_print ("Failed to get display device\n");
goto out;
}
if (opt_enumerate) { if (opt_enumerate) {
g_print ("%s\n", up_device_get_object_path (device)); g_print ("%s\n", up_device_get_object_path (device));
} else { } else {