summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbohu <bohu@google.com>2018-11-10 13:25:12 -0800
committerBo Hu <bohu@google.com>2018-11-10 21:27:44 +0000
commiteabd93d25de5a95d6544822d62af6744176fd5e6 (patch)
tree381500d252fdd68884f8f4a7906ee093d7ce323c
parentaa76124b9f5fddd3279bb144267fda7a29aa9afe (diff)
downloadandroid_device_generic_goldfish-eabd93d25de5a95d6544822d62af6744176fd5e6.tar.gz
android_device_generic_goldfish-eabd93d25de5a95d6544822d62af6744176fd5e6.tar.bz2
android_device_generic_goldfish-eabd93d25de5a95d6544822d62af6744176fd5e6.zip
goldfish: avoid crashing netmgr
When host side does not provide network forwarding service BUG: 119328108 Change-Id: If69eebd401bc25f2de69127164b9cf72545d7915
-rw-r--r--network/netmgr/wifi_forwarder.cpp3
1 files changed, 3 insertions, 0 deletions
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 @@ Result WifiForwarder::init() {
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});