From 7c142e2a9e6b5112d4d01fc348847aba7f3f05a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A8=8A=E6=99=AF=E4=B9=90?= Date: Tue, 10 Jun 2025 16:21:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9init=20=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 樊景乐 --- interfaces/innerkits/fs_manager/fstab_mount.c | 4 ++-- test/unittest/remount/remount_overlay_unittest.cpp | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/interfaces/innerkits/fs_manager/fstab_mount.c b/interfaces/innerkits/fs_manager/fstab_mount.c index 2b1ddc0f2..f39d7c536 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 956d28ae8..c939e0660 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); } -- Gitee