From: Sasha Levitskiy <sanek@google.com>
Date: Mon, 29 Oct 2012 23:54:11 +0000 (-0700)
Subject: am a27072d9: am b8fdecbf: Add parameter checking and error reporting to wpa_blacklist... 
X-Git-Tag: android-x86-4.4-r1~66^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f368213f;hp=f210a2f498f4854bb00528b9167c5f0d17c37f75;p=android-x86%2Fexternal-wpa_supplicant_8.git

am a27072d9: am b8fdecbf: Add parameter checking and error reporting to wpa_blacklist API.

* commit 'a27072d9cc9ca8ee39cc4d8d645f6b0721ba5c8e':
  Add parameter checking and error reporting to wpa_blacklist API.
---

diff --git a/wpa_supplicant/blacklist.c b/wpa_supplicant/blacklist.c
index fa8014c..2e01e7f 100644
--- a/wpa_supplicant/blacklist.c
+++ b/wpa_supplicant/blacklist.c
@@ -23,6 +23,9 @@ struct wpa_blacklist * wpa_blacklist_get(struct wpa_supplicant *wpa_s,
 {
 	struct wpa_blacklist *e;
 
+	if (wpa_s == NULL || bssid == NULL)
+		return NULL;
+
 	e = wpa_s->blacklist;
 	while (e) {
 		if (os_memcmp(e->bssid, bssid, ETH_ALEN) == 0)
@@ -54,6 +57,9 @@ int wpa_blacklist_add(struct wpa_supplicant *wpa_s, const u8 *bssid)
 {
 	struct wpa_blacklist *e;
 
+	if (wpa_s == NULL || bssid == NULL)
+		return -1;
+
 	e = wpa_blacklist_get(wpa_s, bssid);
 	if (e) {
 		e->count++;
@@ -87,6 +93,9 @@ int wpa_blacklist_del(struct wpa_supplicant *wpa_s, const u8 *bssid)
 {
 	struct wpa_blacklist *e, *prev = NULL;
 
+	if (wpa_s == NULL || bssid == NULL)
+		return -1;
+
 	e = wpa_s->blacklist;
 	while (e) {
 		if (os_memcmp(e->bssid, bssid, ETH_ALEN) == 0) {