fix: inner source issue

Signed-off-by: Nxionglei6 <xionglei6@huawei.com>

interfaces/innerkits/fs_manager/fstab_mount.c

@@ -143,7 +143,7 @@ MountStatus GetMountStatusForMountPoint(const char *mp)
             FreeStringVector(mountItems, count);
         }
     }
-    if (found == true) {
+    if (found) {
         status = MOUNT_MOUNTED;
     } else if (feof(fp) > 0) {
         status = MOUNT_UMOUNTED;

services/init/init_common_service.c

@@ -454,14 +454,14 @@ void ServiceReap(Service *service)
     }
 
     if (service->attribute & SERVICE_ATTR_CRITICAL) { // critical
-        if (CalculateCrashTime(service, service->crashTime, service->crashCount) == false) {
+        if (!CalculateCrashTime(service, service->crashTime, service->crashCount)) {
             INIT_LOGE("Critical service \" %s \" crashed %d times, rebooting system",
                 service->name, service->crashCount);
             ServiceStop(GetServiceByName("appspawn"));
             ExecReboot("reboot");
         }
     } else if (!(service->attribute & SERVICE_ATTR_NEED_RESTART)) {
-        if (CalculateCrashTime(service, service->crashTime, service->crashCount) == false) {
+        if (!CalculateCrashTime(service, service->crashTime, service->crashCount)) {
             INIT_LOGE("Service name=%s, crash %d times, no more start.", service->name, service->crashCount);
             return;
         }

services/init/lite/init_cmds.c

@@ -31,16 +31,16 @@ int GetParamValue(const char *symValue, unsigned int symLen, char *paramValue, u
 static void DoExec(const struct CmdArgs *ctx)
 {
     // format: exec /xxx/xxx/xxx xxx
+    if (ctx == NULL || ctx->argv[0] == NULL) {
+        INIT_LOGE("DoExec: invalid arguments");
+        return;
+    }
     pid_t pid = fork();
     if (pid < 0) {
         INIT_LOGE("DoExec: failed to fork child process to exec \"%s\"", ctx->argv[0]);
         return;
     }
     if (pid == 0) {
-        if (ctx == NULL || ctx->argv[0] == NULL) {
-            INIT_LOGE("DoExec: invalid arguments");
-            _exit(0x7f);
-        }
         int ret = execve(ctx->argv[0], ctx->argv, NULL);
         if (ret == -1) {
             INIT_LOGE("DoExec: execute \"%s\" failed: %d.", ctx->argv[0], errno);

services/init/standard/fd_holder_service.c

@@ -197,6 +197,7 @@ static void HandlerFdHolder(int sock)
         INIT_LOGE("Invalid message received: %s", buffer);
         CloseFds(fds, fdCount);
         FreeFds(fds);
+        return;
     }
     char *serviceName = msg[0];
     char *action = msg[1];
@@ -214,16 +215,15 @@ static void HandlerFdHolder(int sock)
     if (strcmp(action, ACTION_HOLD) == 0) {
         INIT_LOGI("Service \' %s \' request init to %s fds", serviceName, action);
         if (HandlerHoldFds(service, fds, fdCount, pollStr) < 0) {
-            CloseFds(fds, fdCount);
         }
     } else if (strcmp(action, ACTION_GET) == 0) {
         // In this case, ignore fds, just close them if fd passed to init
-        CloseFds(fds, fdCount);
         HandlerGetFds(sock, service);
     } else {
         INIT_LOGE("Unexpect action: %s", action);
     }
     FreeFds(fds);
+    CloseFds(fds, fdCount);
     FreeStringVector(msg, msgCount);
 }
 

services/init/standard/init.c

@@ -107,7 +107,7 @@ void SystemInit(void)
 static void EnableDevKmsg(void)
 {
     /* printk_devkmsg default value is ratelimit, We need to set "on" and remove the restrictions */
-    int fd = open("/proc/sys/kernel/printk_devkmsg", O_WRONLY | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IRGRP);
+    int fd = open("/proc/sys/kernel/printk_devkmsg", O_WRONLY | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
     if (fd < 0) {
         return;
     }

services/init/standard/init_cmds.c

@@ -177,12 +177,12 @@ static void DoLoadDefaultParams(const struct CmdArgs *ctx)
 static void DoExec(const struct CmdArgs *ctx)
 {
     // format: exec /xxx/xxx/xxx xxx
+    INIT_ERROR_CHECK(ctx != NULL && ctx->argv[0] != NULL, return,
+        "DoExec: invalid arguments to exec \"%s\"", ctx->argv[0]);
     pid_t pid = fork();
     INIT_ERROR_CHECK(pid >= 0, return, "DoExec: failed to fork child process to exec \"%s\"", ctx->argv[0]);
 
     if (pid == 0) {
-        INIT_ERROR_CHECK(ctx != NULL && ctx->argv[0] != NULL, _exit(0x7f),
-            "DoExec: invalid arguments to exec \"%s\"", ctx->argv[0]);
 #ifdef SUPPORT_PROFILER_HIDEBUG
         do {
             if (access("/system/lib/libhidebug.so", F_OK) != 0) {

services/init/standard/init_service.c

@@ -125,7 +125,7 @@ int ServiceExec(const Service *service)
 
 int SetAccessToken(const Service *service)
 {
-    INIT_ERROR_CHECK(service != NULL, return SERVICE_FAILURE, "%s failed", service->name);
+    INIT_ERROR_CHECK(service != NULL, return SERVICE_FAILURE, "service is null");
     int ret = SetSelfTokenID(service->tokenId);
     INIT_LOGI("%s: token id %lld, set token id result %d", service->name, service->tokenId, ret);
     return ret == 0 ? SERVICE_SUCCESS : SERVICE_FAILURE;

services/log/init_log.c

@@ -80,7 +80,7 @@ void InitToHiLog(InitLogLevel logLevel, const char *fmt, ...)
 static int g_fd = -1;
 void OpenLogDevice(void)
 {
-    int fd = open("/dev/kmsg", O_WRONLY | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IRGRP);
+    int fd = open("/dev/kmsg", O_WRONLY | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
     if (fd >= 0) {
         g_fd = fd;
     }

services/param/adapter/param_dac.c

@@ -204,11 +204,6 @@ static int CheckUserInGroup(gid_t groupId, uid_t uid)
         return -1;
     }
 
-    if (grpResult->gr_name == NULL || grpResult->gr_name == NULL) {
-        PARAM_LOGE("CheckUserInGroup gr_name %s pw_name %s %d %d",
-            grpResult->gr_name, userResult->pw_name, groupId, uid);
-        return -1;
-    }
     PARAM_LOGV("CheckUserInGroup pw_name %s ", userResult->pw_name);
     if (strcmp(grpResult->gr_name, userResult->pw_name) == 0) {
         return 0;

services/param/watcher/proxy/watcher_manager.cpp

@@ -60,13 +60,14 @@ uint32_t WatcherManager::AddWatcher(const std::string &keyPrefix, const sptr<IWa
         uint32_t groupId = 0;
         ret = GetGroupId(groupId);
         WATCHER_CHECK(ret == 0, return 0, "Failed to get group id for %s", keyPrefix.c_str());
-        group = std::make_shared<WatcherGroup>(groupId, keyPrefix);
-        WATCHER_CHECK(group != nullptr, return 0, "Failed to create group for %s", keyPrefix.c_str());
+        TUNE_MAKE_SHARED(group = std::make_shared<WatcherGroup>(groupId, keyPrefix),
+            WATCHER_LOGE("Failed to create group for %s", keyPrefix.c_str()); return 0);
     } else {
         newGroup = group->Emptry();
     }
-    ParamWatcherPtr paramWather = std::make_shared<ParamWatcher>(watcherId, watcher, group);
-    WATCHER_CHECK(paramWather != nullptr, return 0, "Failed to create watcher for %s", keyPrefix.c_str());
+    ParamWatcherPtr paramWather = nullptr;
+    TUNE_MAKE_SHARED(paramWather = std::make_shared<ParamWatcher>(watcherId, watcher, group),
+        WATCHER_LOGE("Failed to create watcher for %s", keyPrefix.c_str()); return 0);
     AddParamWatcher(keyPrefix, group, paramWather);
     if (newGroup) {
         StartLoop();

services/param/watcher/proxy/watcher_manager.h

@@ -29,6 +29,14 @@
 #include "parcel.h"
 #include "system_ability.h"
 #include "watcher_manager_stub.h"
+#define TUNE_MAKE_SHARED(exec_expr0, exec_expr1) \
+    do { \
+        try { \
+            exec_expr0; \
+        } catch(...) { \
+            exec_expr1; \
+        }; \
+    } while (0)
 
 namespace OHOS {
 namespace init_param {

services/utils/init_utils.c

@@ -196,7 +196,7 @@ int SplitString(char *srcPtr, const char *del, char **dstPtr, int maxNum)
     char *buf = NULL;
     dstPtr[0] = strtok_r(srcPtr, del, &buf);
     int counter = 0;
-    while (dstPtr[counter] != NULL && (counter < maxNum)) {
+    while ((counter < maxNum) && (dstPtr[counter] != NULL)) {
         counter++;
         if (counter >= maxNum) {
             break;

test/plugintest/plugin_param_test.c

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

test/unittest/common/cmd_func_test.cpp

@@ -940,7 +940,7 @@ HWTEST_F(StartupInitUTest, cmdFuncDoLoadCfgTest_003, TestSize.Level0)
                 break;
             }
         } while (size > 0);
-        EXPECT_TRUE(hasZpfs == true);
+        EXPECT_TRUE(hasZpfs);
         fclose(fd);
     }
 }

test/unittest/init/group_unittest.cpp

@@ -72,13 +72,13 @@ static void TestHashNodeFree(const HashNode *node)
 static TestHashNode *TestCreateHashNode(const char *value)
 {
     TestHashNode *node = (TestHashNode *)malloc(sizeof(TestHashNode) + strlen(value) + 1);
-    if (node == NULL) {
-        return NULL;
+    if (node == nullptr) {
+        return nullptr;
     }
     int ret = strcpy_s(node->name, strlen(value) + 1, value);
     if (ret != 0) {
         free(node);
-        return NULL;
+        return nullptr;
     }
     HASHMAPInitNode(&node->node);
     return node;
@@ -87,7 +87,7 @@ static TestHashNode *TestCreateHashNode(const char *value)
 static void CreateTestFile(const char *fileName, const char *data)
 {
     FILE *tmpFile = fopen(fileName, "wr");
-    if (tmpFile != NULL) {
+    if (tmpFile != nullptr) {
         fprintf(tmpFile, "%s", data);
         (void)fflush(tmpFile);
         fclose(tmpFile);
@@ -124,13 +124,13 @@ HWTEST_F(InitGroupManagerUnitTest, TestHashMap, TestSize.Level1)
     HashMapAdd(handle, &node1->node);
     HashMapAdd(handle, &node2->node);
     HashNode *node = HashMapGet(handle, (const void *)str1);
-    EXPECT_NE(node != NULL, 0);
+    EXPECT_NE(node != nullptr, 0);
     if (node) {
         TestHashNode *tmp = HASHMAP_ENTRY(node, TestHashNode, node);
         EXPECT_EQ(strcmp(tmp->name, str1), 0);
     }
     node = HashMapGet(handle, (const void *)str2);
-    EXPECT_NE(node != NULL, 0);
+    EXPECT_NE(node != nullptr, 0);
     if (node) {
         TestHashNode *tmp = HASHMAP_ENTRY(node, TestHashNode, node);
         EXPECT_EQ(strcmp(tmp->name, str2), 0);
@@ -142,7 +142,7 @@ HWTEST_F(InitGroupManagerUnitTest, TestHashMap, TestSize.Level1)
     node3 = TestCreateHashNode("Test hash map node 5");
     HashMapAdd(handle, &node3->node);
     node = HashMapGet(handle, (const void *)str3);
-    EXPECT_NE(node != NULL, 0);
+    EXPECT_NE(node != nullptr, 0);
     if (node) {
         TestHashNode *tmp = HASHMAP_ENTRY(node, TestHashNode, node);
         EXPECT_EQ(strcmp(tmp->name, str3), 0);
@@ -155,7 +155,7 @@ HWTEST_F(InitGroupManagerUnitTest, TestHashMap, TestSize.Level1)
     HashMapAdd(handle, &node5->node);
     HashMapRemove(handle, "pre-init");
     node = HashMapGet(handle, (const void *)act);
-    EXPECT_NE(node != NULL, 0);
+    EXPECT_NE(node != nullptr, 0);
     if (node) {
         TestHashNode *tmp = HASHMAP_ENTRY(node, TestHashNode, node);
         EXPECT_EQ(strcmp(tmp->name, act), 0);
@@ -342,7 +342,7 @@ HWTEST_F(InitGroupManagerUnitTest, TestParseServiceCpucore, TestSize.Level1)
     cJSON *serviceItem = cJSON_GetObjectItem(jobItem, "services");
     ASSERT_NE(nullptr, serviceItem);
     Service *service = AddService("test_service22");
-    if (service != NULL) {
+    if (service != nullptr) {
         int ret = ParseOneService(serviceItem, service);
         EXPECT_EQ(ret, 0);
         ReleaseService(service);

test/unittest/init/service_socket_unittest.cpp

@@ -47,9 +47,9 @@ HWTEST_F(ServiceSocketUnitTest, TestCreateSocket, TestSize.Level0)
     sockopt->perm = 0660;
     sockopt->option = SOCKET_OPTION_PASSCRED;
     errno_t ret = strncpy_s(sockopt->name, strlen(testSocName) + 1, testSocName, strlen(testSocName));
-    sockopt->next = NULL;
+    sockopt->next = nullptr;
     EXPECT_EQ(ret, EOK);
-    if (service->socketCfg == NULL) {
+    if (service->socketCfg == nullptr) {
         service->socketCfg = sockopt;
     } else {
         sockopt->next = service->socketCfg->next;

ueventd/ueventd_device_handler.c

@@ -246,6 +246,18 @@ static void BuildDeviceSymbolLinks(char **links, int linkNum, const char *parent
     }
 }
 
+static void FreeSymbolLinks(char **links, int length)
+{
+    if (links != NULL) {
+        for (int i = 0; i < length && links[i] != NULL; i++) {
+            free(links[i]);
+            links[i] = NULL;
+        }
+        free(links);
+        links = NULL;
+    }
+}
+
 static char **GetBlockDeviceSymbolLinks(const struct Uevent *uevent)
 {
     if (uevent == NULL || uevent->subsystem == NULL || STRINGEQUAL(uevent->subsystem, "block") == 0) {
@@ -278,6 +290,7 @@ static char **GetBlockDeviceSymbolLinks(const struct Uevent *uevent)
         char subsystem[SYSPATH_SIZE];
         if (snprintf_s(subsystem, SYSPATH_SIZE, SYSPATH_SIZE - 1, "%s/subsystem", parent) == -1) {
             INIT_LOGE("Failed to build subsystem path for device \" %s \"", uevent->syspath);
+            FreeSymbolLinks(links, BLOCKDEVICE_LINKS);
             return NULL;
         }
         char *bus = GetRealPath(subsystem);
@@ -305,18 +318,6 @@ static char **GetBlockDeviceSymbolLinks(const struct Uevent *uevent)
     return links;
 }
 
-static void FreeSymbolLinks(char **links)
-{
-    if (links != NULL) {
-        for (int i = 0; links[i] != NULL; i++) {
-            free(links[i]);
-            links[i] = NULL;
-        }
-        free(links);
-        links = NULL;
-    }
-}
-
 static void HandleDeviceNode(const struct Uevent *uevent, const char *deviceNode, bool isBlock)
 {
     ACTION action = uevent->action;
@@ -353,7 +354,7 @@ static void HandleDeviceNode(const struct Uevent *uevent, const char *deviceNode
         INIT_LOGV("Device %s changed", uevent->syspath);
     }
     // Ignore other actions
-    FreeSymbolLinks(symLinks);
+    FreeSymbolLinks(symLinks, BLOCKDEVICE_LINKS);
 }
 
 static const char *GetDeviceName(char *sysPath, const char *deviceName)

ueventd/ueventd_read_cfg.c

@@ -151,7 +151,7 @@ static int ParseSysfsConfig(char *p)
 static int ParseFirmwareConfig(char *p)
 {
     INIT_LOGV("Parse firmware config info: %s", p);
-    INIT_CHECK_ONLY_ELOG(!INVALIDSTRING(p), "Invalid argument");
+    INIT_ERROR_CHECK(!INVALIDSTRING(p), return -1, "Invalid argument");
 
     // Sanity checks
     struct stat st = {};