diff --git a/interfaces/innerkits/native/file_share/src/file_share.cpp b/interfaces/innerkits/native/file_share/src/file_share.cpp index 7cb30614f582bc3a2c996dc7960341d0aded7592..92d4a1171accff69fa7640a145b0a8e93d1b7b92 100644 --- a/interfaces/innerkits/native/file_share/src/file_share.cpp +++ b/interfaces/innerkits/native/file_share/src/file_share.cpp @@ -384,7 +384,8 @@ int32_t FileShare::CreateShareFile(const vector &uriList, int32_t FileShare::DeleteShareFile(uint32_t tokenId, const vector &uriList) { lock_guard lock(mapMutex_); - string bundleName, currentUid; + string bundleName + string currentUid; int32_t ret = GetTargetInfo(tokenId, bundleName, currentUid); if (ret != 0) { LOGE("Failed to delete share file %{public}d", -EINVAL); diff --git a/test/fuzztest/remotefileshare_fuzzer/remotefileshare_fuzzer.cpp b/test/fuzztest/remotefileshare_fuzzer/remotefileshare_fuzzer.cpp index c47b367c473b69a2be68d55936ff1b345cd18ad4..882a4ffb114d6a2b36b9136e86de44706b47087a 100644 --- a/test/fuzztest/remotefileshare_fuzzer/remotefileshare_fuzzer.cpp +++ b/test/fuzztest/remotefileshare_fuzzer/remotefileshare_fuzzer.cpp @@ -32,19 +32,19 @@ namespace ModuleRemoteFileShare { namespace { constexpr int HMDFS_CID_SIZE = 64; constexpr unsigned HMDFS_IOC = 0xf2; - const char* SHARE_PATH = "/data/storage/el2/distributedfiles/.share"; + const char* g_sharePATH = "/data/storage/el2/distributedfiles/.share"; } -#define HMDFS_IOC_SET_SHARE_PATH _IOW(HMDFS_IOC, 1, struct hmdfs_share_control) +#define HMDFS_IOC_SET_SHARE_PATH _IOW(HMDFS_IOC, 1, struct HmdfsShareControl) -struct hmdfs_share_control { - int src_fd; +struct HmdfsShareControl { + int srcFd; char cid[HMDFS_CID_SIZE]; }; bool ShareFilePathIoctlFdAndCidFuzzTest(const uint8_t* data, size_t size) { - struct hmdfs_share_control sc; + struct HmdfsShareControl sc; int32_t ret = 0; int32_t dirFd; @@ -52,15 +52,15 @@ bool ShareFilePathIoctlFdAndCidFuzzTest(const uint8_t* data, size_t size) return false; } - if (access(SHARE_PATH, F_OK) != 0) { - ret = mkdir(SHARE_PATH, S_IRWXU | S_IRWXG | S_IXOTH); + if (access(g_sharePATH, F_OK) != 0) { + ret = mkdir(g_sharePATH, S_IRWXU | S_IRWXG | S_IXOTH); if (ret < 0) { return false; } } char realPath[PATH_MAX] = {0}; - if (!realpath(SHARE_PATH, realPath)) { + if (!realpath(g_sharePATH, realPath)) { return false; } dirFd = open(realPath, O_RDONLY); @@ -69,7 +69,7 @@ bool ShareFilePathIoctlFdAndCidFuzzTest(const uint8_t* data, size_t size) } const char* cid = reinterpret_cast(data); - sc.src_fd = size; + sc.srcFd = size; if (memcpy_s(sc.cid, HMDFS_CID_SIZE, cid, size) != 0) { close(dirFd); return false; @@ -86,7 +86,7 @@ bool ShareFilePathIoctlFdAndCidFuzzTest(const uint8_t* data, size_t size) bool ShareFilePathIoctlCidFuzzTest(const uint8_t* data, size_t size) { - struct hmdfs_share_control sc; + struct HmdfsShareControl sc; int32_t ret = 0; int32_t dirFd; int32_t srcFd; @@ -95,15 +95,15 @@ bool ShareFilePathIoctlCidFuzzTest(const uint8_t* data, size_t size) return false; } - if (access(SHARE_PATH, F_OK) != 0) { - ret = mkdir(SHARE_PATH, S_IRWXU | S_IRWXG | S_IXOTH); + if (access(g_sharePATH, F_OK) != 0) { + ret = mkdir(g_sharePATH, S_IRWXU | S_IRWXG | S_IXOTH); if (ret < 0) { return false; } } char realPath[PATH_MAX] = {0}; - if (!realpath(SHARE_PATH, realPath)) { + if (!realpath(g_sharePATH, realPath)) { return false; } dirFd = open(realPath, O_RDONLY); @@ -117,7 +117,7 @@ bool ShareFilePathIoctlCidFuzzTest(const uint8_t* data, size_t size) close(dirFd); return false; } - sc.src_fd = size; + sc.srcFd = size; const char* cid = reinterpret_cast(data); if (memcpy_s(sc.cid, HMDFS_CID_SIZE, cid, size) != 0) { close(dirFd); @@ -138,7 +138,7 @@ bool ShareFilePathIoctlCidFuzzTest(const uint8_t* data, size_t size) bool ShareFilePathIoctlFdFuzzTest(const uint8_t* data, size_t size) { - struct hmdfs_share_control sc; + struct HmdfsShareControl sc; int32_t ret = 0; int32_t dirFd; @@ -146,15 +146,15 @@ bool ShareFilePathIoctlFdFuzzTest(const uint8_t* data, size_t size) return false; } - if (access(SHARE_PATH, F_OK) != 0) { - ret = mkdir(SHARE_PATH, S_IRWXU | S_IRWXG | S_IXOTH); + if (access(g_sharePATH, F_OK) != 0) { + ret = mkdir(g_sharePATH, S_IRWXU | S_IRWXG | S_IXOTH); if (ret < 0) { return false; } } char realPath[PATH_MAX] = {0}; - if (!realpath(SHARE_PATH, realPath)) { + if (!realpath(g_sharePATH, realPath)) { return false; } @@ -168,7 +168,7 @@ bool ShareFilePathIoctlFdFuzzTest(const uint8_t* data, size_t size) close(dirFd); return false; } - sc.src_fd = size; + sc.srcFd = size; ret = ioctl(dirFd, HMDFS_IOC_SET_SHARE_PATH, &sc); if (ret < 0) {