From f37d8a4da496a9a12fb0ff2b8de6a39130d8fa1f Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 28 May 2016 22:35:30 +0300 Subject: [PATCH] Indicate scan failure event on parameter cloning failure This is more consistent with the radio_add_work() error case. Signed-off-by: Jouni Malinen --- wpa_supplicant/scan.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 330679c72..cb223abca 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -227,10 +227,8 @@ int wpa_supplicant_trigger_scan(struct wpa_supplicant *wpa_s, } ctx = wpa_scan_clone_params(params); - if (ctx == NULL) - return -1; - - if (radio_add_work(wpa_s, 0, "scan", 0, wpas_trigger_scan_cb, ctx) < 0) + if (!ctx || + radio_add_work(wpa_s, 0, "scan", 0, wpas_trigger_scan_cb, ctx) < 0) { wpa_scan_free_params(ctx); wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_FAILED "ret=-1");