Snap for 6600963 from 1bb206bd0236260ad3e2f8305b60bab376225a83 to sc-release

Change-Id: Icebffa47fd7d9c226e3919a301888ff341fa0ce6

3 files changed, 9 insertions, 2 deletions

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<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());
diff --git a/liblog/pmsg_reader.cpp b/liblog/pmsg_reader.cpp
index 0e39aab14..564090087 100644
--- a/liblog/pmsg_reader.cpp
+++ b/liblog/pmsg_reader.cpp
@@ -96,7 +96,7 @@ int PmsgRead(struct logger_list* logger_list, struct log_msg* log_msg) {
           ((logger_list->start.tv_sec != buf.l.realtime.tv_sec) ||
            (logger_list->start.tv_nsec <= buf.l.realtime.tv_nsec)))) &&
         (!logger_list->pid || (logger_list->pid == buf.p.pid))) {
-      char* msg = reinterpret_cast<char*>(&log_msg->entry) + log_msg->entry.hdr_size;
+      char* msg = reinterpret_cast<char*>(&log_msg->entry) + sizeof(log_msg->entry);
       *msg = buf.prio;
       fd = atomic_load(&logger_list->fd);
       if (fd <= 0) {
diff --git a/logd/CompressionEngine.cpp b/logd/CompressionEngine.cpp
index f37208b84..f9c59792f 100644
--- a/logd/CompressionEngine.cpp
+++ b/logd/CompressionEngine.cpp
@@ -23,7 +23,7 @@
 #include <zstd.h>
 
 CompressionEngine& CompressionEngine::GetInstance() {
-    CompressionEngine* engine = new ZstdCompressionEngine();
+    static CompressionEngine* engine = new ZstdCompressionEngine();
     return *engine;
 }