From 80d1a294d1e240b62bf4b68111ff134af07bb0e7 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Wed, 28 Feb 2018 10:14:15 -0600 Subject: [PATCH] Allow ctrl-d out of the prompt for devices Currently this will segfault fwupdmgr Choose a device: 1. 8a21cacfb0a8d2b30c5ee9290eb71db021619f8b (XPS 13 9370 System Firmware) 2. cb52b4cd86255a70d1d9e6b09c6bf00b9f876b61 (XPS 9370 Thunderbolt Controller) Thread 1 "fwupdmgr" received signal SIGSEGV, Segmentation fault. fu_util_prompt_for_device (priv=, error=) at ../src/fu-util.c:315 315 return g_object_ref (dev); --- src/fu-util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/fu-util.c b/src/fu-util.c index 2ff08e273..45915e087 100644 --- a/src/fu-util.c +++ b/src/fu-util.c @@ -311,6 +311,13 @@ fu_util_prompt_for_device (FuUtilPrivate *priv, GError **error) fwupd_device_get_name (dev)); } idx = fu_util_prompt_for_number (devices_filtered->len); + if (idx == 0) { + g_set_error_literal (error, + FWUPD_ERROR, + FWUPD_ERROR_NOTHING_TO_DO, + "Request canceled"); + return NULL; + } dev = g_ptr_array_index (devices_filtered, idx - 1); return g_object_ref (dev); }