commit b5340ef4c2b27259fcb03bc6ee98b73012a2d772
author Linux Build Service Account <lnxbuild@localhost> Sat Nov 08 05:37:17 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Nov 08 05:37:17 2014 -0800
tree acb439e2af0c0309fe318bf5100988abea5da02d
parent b4a0e1506ec2a59d28181eedb9a2d8dd8a037cf1
parent 520a9be205422b4e23049711c8a4a2185914a7e1

Merge "Check for monitor_conn existence before accessing the same"

wifi/wifi.c

diff --git a/wifi/wifi.c b/wifi/wifi.c
index 292089e..c61ef94 100644
--- a/wifi/wifi.c
+++ b/wifi/wifi.c
@@ -617,9 +617,14 @@
 int wifi_ctrl_recv(char *reply, size_t *reply_len)
 {
     int res;
-    int ctrlfd = wpa_ctrl_get_fd(monitor_conn);
+    int ctrlfd;
     struct pollfd rfds[2];
 
+    if (monitor_conn == NULL) {
+        ALOGE("%s: monitor_conn is NULL\n", __func__);
+        return -2;
+    }
+    ctrlfd = wpa_ctrl_get_fd(monitor_conn);
     memset(rfds, 0, 2 * sizeof(struct pollfd));
     rfds[0].fd = ctrlfd;
     rfds[0].events |= POLLIN;