commit c0d8ada5ebefa022a9d3ed62b51c5d3c093e3d91
author Bernie Innocenti <codewiz@google.com> Wed Nov 04 12:51:22 2020 +0900
committer Bernie Innocenti <codewiz@google.com> Fri Nov 27 21:08:24 2020 +0900
tree 47d74e5af52b13717b52e52214892c1e3b2feae9
parent 7cbd5f77bd86d9cbf611281a957581911a83fde7

Fix netd crash on gethostbyname(NULL) and add a regression test

Bug: 169105756
Change-Id: I923d28d5bb83c3db0927dffffd3063e3add6a91a

gethnamaddr.cpp

diff --git a/gethnamaddr.cpp b/gethnamaddr.cpp
index 23f94bb..6a5f116 100644
--- a/gethnamaddr.cpp
+++ b/gethnamaddr.cpp
@@ -388,8 +388,11 @@
 int resolv_gethostbyname(const char* name, int af, hostent* hp, char* buf, size_t buflen,
                          const android_net_context* netcontext, hostent** result,
                          NetworkDnsEventReported* event) {
-    getnamaddr info;
+    if (name == nullptr || hp == nullptr) {
+        return EAI_SYSTEM;
+    }
 
+    getnamaddr info;
     ResState res;
     res_init(&res, netcontext, event);