diff --git a/interfaces/innerkits/fs_manager/fstab_mount.c b/interfaces/innerkits/fs_manager/fstab_mount.c index 2b1ddc0f201e3cc4b8b2fb19401a4e5c5ba338cc..f39d7c536450b790e9c75a40ef8a2a6ed17bcf90 100755 --- a/interfaces/innerkits/fs_manager/fstab_mount.c +++ b/interfaces/innerkits/fs_manager/fstab_mount.c @@ -796,8 +796,8 @@ int MountOneWithFstabFile(const char *fstabFile, const char *devName, bool requi rc = HvbDmVerityinit(fstab); if (rc != 0) { BEGET_LOGE("set dm_verity init, ret = 0x%x", rc); - ReleaseFstab(fstab); - fstab = NULL; + ReleaseFstab(fstab); + fstab = NULL; return rc; } } diff --git a/test/unittest/remount/remount_overlay_unittest.cpp b/test/unittest/remount/remount_overlay_unittest.cpp index 956d28ae8439d58af18514a2da2b6ddd3fb5a7b8..c939e066007b32b0ae33777859bcd68a8cc4c3da 100644 --- a/test/unittest/remount/remount_overlay_unittest.cpp +++ b/test/unittest/remount/remount_overlay_unittest.cpp @@ -45,25 +45,25 @@ HWTEST_F(RemountOverlayUnitTest, Init_IsSkipRemountTest_001, TestSize.Level0) bool ret = IsSkipRemount(mentry); EXPECT_EQ(ret, true); - strcpy(mentry.mnt_type, "ufs"); - strcpy(mentry.mnt_dir, "test"); + snprintf(mentry.mnt_type, sizeof(mentry.mnt_type), "%s", "ufs"); + snprintf(mentry.mnt_dir, sizeof(mentry.mnt_dir), "%s", "test"); ret = IsSkipRemount(mentry); EXPECT_EQ(ret, true); - strcpy(mentry.mnt_dir, "/"); + snprintf(mentry.mnt_dir, sizeof(mentry.mnt_dir), "%s", "/"); ret = IsSkipRemount(mentry); EXPECT_EQ(ret, true); - strcpy(mentry.mnt_type, "er11ofs"); + snprintf(mentry.mnt_type, sizeof(mentry.mnt_type), "%s", "er11ofs"); ret = IsSkipRemount(mentry); EXPECT_EQ(ret, true); - strcpy(mentry.mnt_type, "erofs"); - strcpy(mentry.mnt_fsname, "/dev/block/ndm-"); + snprintf(mentry.mnt_type, sizeof(mentry.mnt_type), "%s", "erofs"); + snprintf(mentry.mnt_fsname, sizeof(mentry.mnt_fsname), "%s", "/dev/block/ndm-"); ret = IsSkipRemount(mentry); EXPECT_EQ(ret, true); - strcpy(mentry.mnt_fsname, "/dev/block/dm-1"); + snprintf(mentry.mnt_fsname, sizeof(mentry.mnt_fsname), "%s", "/dev/block/dm-1"); ret = IsSkipRemount(mentry); EXPECT_EQ(ret, false); }