dbus: Fix error path in scan request handling

In case the scan request handling fails, exit cleanly, i.e., without
setting internal state such as the 'scan_res_handler' pointer.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>

diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 3897d98f4e297f9802dce548b2d502268bbc6afc..db121319626e7dd26079a7a3716c3a563bfeb02d 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -1731,6 +1731,7 @@ DBusMessage * wpas_dbus_handler_scan(DBusMessage *message,
                                        reply = wpas_dbus_error_scan_error(
                                                message,
                                                "Scan request rejected");
+                                       goto out;
                                }
                        } else {
                                wpa_s->scan_req = MANUAL_SCAN_REQ;
@@ -1757,6 +1758,7 @@ DBusMessage * wpas_dbus_handler_scan(DBusMessage *message,
                                                false)) {
                        reply = wpas_dbus_error_scan_error(
                                message, "Scan request rejected");
+                       goto out;
                }
        } else {
                wpa_printf(MSG_DEBUG, "%s[dbus]: Unknown scan type: %s",