commit 7a335fc8655788f60107da2a137d6979d9fc0109
author Weilun Du <wdu@google.com> Mon Nov 28 12:39:11 2016 -0800
committer Bo Hu <bohu@google.com> Mon Nov 28 22:50:02 2016 +0000
tree 2907c89693228829f7c3e5fd48c5fbbb4a392254
parent b17ead9d55e1f6e93d4b1d4db1ef0bc4f57a31e6

Do not init slirp proxy when op_http_proxy is null

Fix the bug that would cause intermittent seg fault because previously slirp
proxy is always initialized.

BUG: 33174999

Change-Id: Ia96e5a8b4d1462bae132a37c6c1eaa3aac3e1172
Signed-off-by: Weilun Du <wdu@google.com>

android-qemu2-glue/proxy/slirp_proxy.cpp

diff --git a/android-qemu2-glue/proxy/slirp_proxy.cpp b/android-qemu2-glue/proxy/slirp_proxy.cpp
index da53263..c6098cc 100644
--- a/android-qemu2-glue/proxy/slirp_proxy.cpp
+++ b/android-qemu2-glue/proxy/slirp_proxy.cpp
@@ -106,6 +106,9 @@
 }
 
 bool qemu_android_setup_http_proxy(const char* http_proxy) {
+    if (!http_proxy) {
+        return true;
+    }
     // Inject TCP proxy implementation into SLIRP stack.
     // Initialization of the proxy will happen later.
     static const SlirpProxyOps android_proxy_ops = {