ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "[adb] Check for null in mdns connect info." am: cf88259783 am: 4f1c40957a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1340738

Change-Id: I15b95626a658646b98ff628e3c05d56d7a29a930
This commit is contained in:
Joshua Duong 2020-06-17 01:48:21 +00:00 • committed by Automerger Merge Worker
commit a60f2d8c50
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/client/transport_mdns.cpp
View file

@ -680,6 +680,13 @@ std::string mdns_list_discovered_services() {
std::optional<MdnsInfo> 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());