commit 01b49fcda9c8aeb7be0ac2dea0e0b2c8e22adfce
author Hai Shalom <haishalom@google.com> Wed Oct 28 20:54:53 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 28 20:54:53 2020 +0000
tree 963464f6bab316e5558e1ca9d597207b904a8e2e
parent 5213155b6f29ce04aff7266b21b6f2220f2afe0c
parent b3a7c70cc8d55b57c173c3b21f6b181a76111316

Merge "[wpa_supplicant] Remove null checks for URL in deauth imminent"

wpa_supplicant/hidl/1.4/hidl.cpp

diff --git a/wpa_supplicant/hidl/1.4/hidl.cpp b/wpa_supplicant/hidl/1.4/hidl.cpp
index 0bf03d6..556cf56 100644
--- a/wpa_supplicant/hidl/1.4/hidl.cpp
+++ b/wpa_supplicant/hidl/1.4/hidl.cpp
@@ -250,13 +250,13 @@
 void wpas_hidl_notify_hs20_rx_deauth_imminent_notice(
     struct wpa_supplicant *wpa_s, u8 code, u16 reauth_delay, const char *url)
 {
-	if (!wpa_s || !wpa_s->global->hidl || !url)
+	if (!wpa_s || !wpa_s->global->hidl)
 		return;
 
 	wpa_printf(
 	    MSG_DEBUG,
 	    "Notifying HS20 deauth imminent notice rx to hidl control: %s",
-	    url);
+	    url ? url : "<no URL>");
 
 	HidlManager *hidl_manager = HidlManager::getInstance();
 	if (!hidl_manager)

wpa_supplicant/hidl/1.4/hidl_manager.cpp

diff --git a/wpa_supplicant/hidl/1.4/hidl_manager.cpp b/wpa_supplicant/hidl/1.4/hidl_manager.cpp
index 9bb451a..904bfc9 100644
--- a/wpa_supplicant/hidl/1.4/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/1.4/hidl_manager.cpp
@@ -931,7 +931,7 @@
 void HidlManager::notifyHs20RxDeauthImminentNotice(
     struct wpa_supplicant *wpa_s, u8 code, u16 reauth_delay, const char *url)
 {
-	if (!wpa_s || !url)
+	if (!wpa_s)
 		return;
 
 	if (sta_iface_object_map_.find(wpa_s->ifname) ==

wpa_supplicant/notify.c

diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index 3cd85aa..e096579 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -1007,7 +1007,7 @@
 						const char *url)
 {
 #ifdef CONFIG_HS20
-	if (!wpa_s || !url)
+	if (!wpa_s)
 		return;
 
 	wpas_hidl_notify_hs20_rx_deauth_imminent_notice(wpa_s, code, reauth_delay,