commit eabd93d25de5a95d6544822d62af6744176fd5e6
author bohu <bohu@google.com> Sat Nov 10 13:25:12 2018 -0800
committer Bo Hu <bohu@google.com> Sat Nov 10 21:27:44 2018 +0000
tree 381500d252fdd68884f8f4a7906ee093d7ce323c
parent aa76124b9f5fddd3279bb144267fda7a29aa9afe

goldfish: avoid crashing netmgr

When host side does not provide network forwarding service

BUG: 119328108
Change-Id: If69eebd401bc25f2de69127164b9cf72545d7915

network/netmgr/wifi_forwarder.cpp

diff --git a/network/netmgr/wifi_forwarder.cpp b/network/netmgr/wifi_forwarder.cpp
index 64f5b66..e6997d4 100644
--- a/network/netmgr/wifi_forwarder.cpp
+++ b/network/netmgr/wifi_forwarder.cpp
@@ -185,6 +185,9 @@
 
 
 void WifiForwarder::getPollData(std::vector<pollfd>* fds) const {
+    if (mPipeFd == -1) {
+        return;
+    }
     int pcapFd = pcap_get_selectable_fd(mMonitorPcap);
     if (pcapFd != -1) {
         fds->push_back(pollfd{pcapFd, POLLIN, 0});