From f4a51e9e357ce6bbfb9e80c808071be31a13de4e Mon Sep 17 00:00:00 2001
From: zhou-liting125 <zhouliting5@huawei.com>
Date: Fri, 25 Mar 2022 16:10:27 +0800
Subject: [PATCH] Modify the endogenous issue

Signed-off-by: zhou-liting125 <zhouliting5@huawei.com>
---
 BUILD.gn                                       | 0
 LICENSE                                        | 0
 README.md                                      | 0
 README_zh.md                                   | 0
 frameworks/liteipc/include/ipc_log.h           | 0
 frameworks/liteipc/include/liteipc.h           | 0
 frameworks/liteipc/include/liteipc_pri.h       | 0
 frameworks/liteipc/src/liteipc_adapter.c       | 2 +-
 frameworks/liteipc/src/serializer.c            | 0
 frameworks/liteipc_linux/src/liteipc_adapter.c | 7 ++++++-
 interfaces/kits/liteipc_adapter.h              | 0
 interfaces/kits/ndk_list.h                     | 0
 interfaces/kits/serializer.h                   | 0
 13 files changed, 7 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 BUILD.gn
 mode change 100755 => 100644 LICENSE
 mode change 100755 => 100644 README.md
 mode change 100755 => 100644 README_zh.md
 mode change 100755 => 100644 frameworks/liteipc/include/ipc_log.h
 mode change 100755 => 100644 frameworks/liteipc/include/liteipc.h
 mode change 100755 => 100644 frameworks/liteipc/include/liteipc_pri.h
 mode change 100755 => 100644 frameworks/liteipc/src/liteipc_adapter.c
 mode change 100755 => 100644 frameworks/liteipc/src/serializer.c
 mode change 100755 => 100644 interfaces/kits/liteipc_adapter.h
 mode change 100755 => 100644 interfaces/kits/ndk_list.h
 mode change 100755 => 100644 interfaces/kits/serializer.h

diff --git a/BUILD.gn b/BUILD.gn
old mode 100755
new mode 100644
diff --git a/LICENSE b/LICENSE
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/README_zh.md b/README_zh.md
old mode 100755
new mode 100644
diff --git a/frameworks/liteipc/include/ipc_log.h b/frameworks/liteipc/include/ipc_log.h
old mode 100755
new mode 100644
diff --git a/frameworks/liteipc/include/liteipc.h b/frameworks/liteipc/include/liteipc.h
old mode 100755
new mode 100644
diff --git a/frameworks/liteipc/include/liteipc_pri.h b/frameworks/liteipc/include/liteipc_pri.h
old mode 100755
new mode 100644
diff --git a/frameworks/liteipc/src/liteipc_adapter.c b/frameworks/liteipc/src/liteipc_adapter.c
old mode 100755
new mode 100644
index ab92f7c..d1afe84
--- a/frameworks/liteipc/src/liteipc_adapter.c
+++ b/frameworks/liteipc/src/liteipc_adapter.c
@@ -772,7 +772,7 @@ static void TimeoutHandler(int signo, void *arg)
         .handle = g_ipcCallbackCb.handleId,
         .token = node->token
     };
-    UnregisterIpcCallback(sid);
+    (void)UnregisterIpcCallback(sid);
 }
 
 int32_t StartIpcCbTimer(uint32_t mode, uint32_t timeoutMs, AnonymousApi* node, timer_t* timerId)
diff --git a/frameworks/liteipc/src/serializer.c b/frameworks/liteipc/src/serializer.c
old mode 100755
new mode 100644
diff --git a/frameworks/liteipc_linux/src/liteipc_adapter.c b/frameworks/liteipc_linux/src/liteipc_adapter.c
index 4b4fb72..2633c09 100644
--- a/frameworks/liteipc_linux/src/liteipc_adapter.c
+++ b/frameworks/liteipc_linux/src/liteipc_adapter.c
@@ -635,6 +635,9 @@ int32_t StartLoop(const IpcContext* context, IpcMsgHandler func, void* arg)
 
 static void BinderThreadLoop(const IpcContext* context, IpcMsgHandler func, void* arg)
 {
+    if (context == NULL || arg == NULL) {
+        return;
+    }
     struct binder_write_read bwr = {0};
     uint32_t readbuf[READ_BUFFER_SIZE] = {0};
     struct FuncPair funcPair = {0};
@@ -984,7 +987,9 @@ static void* CallbackDispatch(void* arg)
         return (void*)(intptr_t)LITEIPC_EINTNL;
     }
     g_ipcCallbackCb.threadWorking = true;
-    StartLoop(ipcContext, (IpcMsgHandler)TryCallBack, NULL);
+    if (StartLoop(ipcContext, (IpcMsgHandler)TryCallBack, NULL) != LITEIPC_OK) {
+        return (void*)(intptr_t)LITEIPC_EINTNL;
+    }
     return (void*)(intptr_t)LITEIPC_OK;
 }
 
diff --git a/interfaces/kits/liteipc_adapter.h b/interfaces/kits/liteipc_adapter.h
old mode 100755
new mode 100644
diff --git a/interfaces/kits/ndk_list.h b/interfaces/kits/ndk_list.h
old mode 100755
new mode 100644
diff --git a/interfaces/kits/serializer.h b/interfaces/kits/serializer.h
old mode 100755
new mode 100644