From 2421c807ee7f6625f4bebac8c29946f667784ee2 Mon Sep 17 00:00:00 2001
From: yuhaoqiang <690364942@qq.com>
Date: Mon, 13 Jan 2025 17:10:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlite=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=B8=8Afd=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yuhaoqiang <yuhaoqiang@huawei.com>
---
 .../faultloggerd_client/faultloggerd_socket.cpp          | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/interfaces/innerkits/faultloggerd_client/faultloggerd_socket.cpp b/interfaces/innerkits/faultloggerd_client/faultloggerd_socket.cpp
index aac07b813..f9123881f 100644
--- a/interfaces/innerkits/faultloggerd_client/faultloggerd_socket.cpp
+++ b/interfaces/innerkits/faultloggerd_client/faultloggerd_socket.cpp
@@ -50,7 +50,7 @@ bool StartConnect(int32_t sockFd, const char* socketName, uint32_t timeout)
         }
     }
 
-    struct sockaddr_un server{};
+    struct sockaddr_un server{0};
     server.sun_family = AF_LOCAL;
     std::string fullPath = std::string(FAULTLOGGERD_SOCK_BASE_PATH) + std::string(socketName);
     errno_t err = strncpy_s(server.sun_path, sizeof(server.sun_path), fullPath.c_str(), sizeof(server.sun_path) - 1);
@@ -87,8 +87,7 @@ static bool GetServerSocket(int32_t& sockFd, const char* name)
     }
 
     std::string path = std::string(FAULTLOGGERD_SOCK_BASE_PATH) + std::string(name);
-    struct sockaddr_un server;
-    (void)memset_s(&server, sizeof(server), 0, sizeof(server));
+    struct sockaddr_un server{0};
     server.sun_family = AF_LOCAL;
     if (strncpy_s(server.sun_path, sizeof(server.sun_path), path.c_str(), sizeof(server.sun_path) - 1) != 0) {
         DFXLOGE("%{public}s :: strncpy failed.", __func__);
@@ -145,7 +144,7 @@ static bool RecvMsgFromSocket(int sockFd, void* data, const size_t dataLength)
         return false;
     }
 
-    struct msghdr msgh{};
+    struct msghdr msgh{0};
     char msgBuffer[SOCKET_BUFFER_SIZE] = { 0 };
     struct iovec iov = {
         .iov_base = msgBuffer,
@@ -185,7 +184,7 @@ static bool SendMsgCtlToSocket(int sockFd, const void *cmsg, uint32_t cmsgLen)
         return false;
     }
 
-    struct msghdr msgh;
+    struct msghdr msgh{0};
     char iovBase[] = "";
     struct iovec iov = {.iov_base = iovBase, .iov_len = 1};
     msgh.msg_iov = &iov;
-- 
Gitee


From 17939e2593eae2457e364f9c75ebf839fe08fb28 Mon Sep 17 00:00:00 2001
From: yuhaoqiang <yuhaoqiang@huawei.com>
Date: Tue, 14 Jan 2025 10:16:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?lite=E8=AE=BE=E5=A4=87=E5=B1=8F=E8=94=BD?=
 =?UTF-8?q?=E5=86=85=E6=A0=B8=E6=A0=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yuhaoqiang <yuhaoqiang@huawei.com>
---
 interfaces/innerkits/backtrace/dfx_kernel_stack.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interfaces/innerkits/backtrace/dfx_kernel_stack.cpp b/interfaces/innerkits/backtrace/dfx_kernel_stack.cpp
index 1bd7e20bb..48485c111 100644
--- a/interfaces/innerkits/backtrace/dfx_kernel_stack.cpp
+++ b/interfaces/innerkits/backtrace/dfx_kernel_stack.cpp
@@ -103,7 +103,7 @@ bool FormatThreadKernelStack(const std::string& kernelStack, DfxThreadStack& thr
 
 bool FormatProcessKernelStack(const std::string& kernelStack, std::vector<DfxThreadStack>& processStack)
 {
-#ifdef __aarch64__
+#if!defined(is_ohos_lite) && defined(__aarch64__)
     std::vector<std::string> threadKernelStackVec;
     OHOS::SplitStr(kernelStack, "Thread info:", threadKernelStackVec);
     if (threadKernelStackVec.size() == 1) {
@@ -115,7 +115,7 @@ bool FormatProcessKernelStack(const std::string& kernelStack, std::vector<DfxThr
             processStack.emplace_back(threadStack);
         }
     }
-    return true;
+    return  true;
 #else
     return false;
 #endif
-- 
Gitee