aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-02-22 19:32:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-22 19:32:37 +0000
commit5d36baee95096e39e49aace66d65476ebaad9bc1 (patch)
tree1b817fb332029d4156cf8b1045832d1a9f2e10f3
parentbfe0640e41204ccc090c364e02675de10d87c923 (diff)
parenta6b24b7afb79294e6b709ede11395f13370d67a0 (diff)
downloadandroid_bionic-5d36baee95096e39e49aace66d65476ebaad9bc1.tar.gz
android_bionic-5d36baee95096e39e49aace66d65476ebaad9bc1.tar.bz2
android_bionic-5d36baee95096e39e49aace66d65476ebaad9bc1.zip
Merge "gethostbyname: fix crash"
-rw-r--r--libc/netbsd/gethnamaddr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libc/netbsd/gethnamaddr.c b/libc/netbsd/gethnamaddr.c
index 04b1f54d8..ee5052e4c 100644
--- a/libc/netbsd/gethnamaddr.c
+++ b/libc/netbsd/gethnamaddr.c
@@ -753,6 +753,7 @@ gethostbyname_internal(const char *name, int af, res_state res, const char *ifac
}
proxy = android_open_proxy();
+ if (proxy == NULL) goto exit;
/* This is writing to system/netd/DnsProxyListener.cpp and changes
* here need to be matched there */