From e3f542b3c3259f880996da121f691ca06d6ecf25 Mon Sep 17 00:00:00 2001 From: Joshua Duong Date: Tue, 16 Jun 2020 15:04:51 -0700 Subject: [adb] Check for null in mdns connect info. Adb client does not use these values, so just ignore it. Bug: b/158824677 Test: 'adb -H 127.0.0.1 -P 5037 devices' does not crash. Change-Id: I4dada6e5e1714157bbf1af370510dfa7bfbd6b17 (cherry picked from commit 282385f823c8ee632e3f8e5eb8813fef40cbd543) --- adb/client/transport_mdns.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/adb/client/transport_mdns.cpp b/adb/client/transport_mdns.cpp index 9db24532f..961121202 100644 --- a/adb/client/transport_mdns.cpp +++ b/adb/client/transport_mdns.cpp @@ -680,6 +680,13 @@ std::string mdns_list_discovered_services() { std::optional mdns_get_connect_service_info(std::string_view name) { CHECK(!name.empty()); + // only adb server creates these registries + if (!ResolvedService::sAdbTransportServices && !ResolvedService::sAdbSecureConnectServices) { + return std::nullopt; + } + CHECK(ResolvedService::sAdbTransportServices); + CHECK(ResolvedService::sAdbSecureConnectServices); + auto mdns_instance = mdns::mdns_parse_instance_name(name); if (!mdns_instance.has_value()) { D("Failed to parse mDNS name [%s]", name.data()); -- cgit v1.2.3