diff --git a/dm/test/fuzztest/displaymanager_fuzzer/displaymanager_fuzzer.cpp b/dm/test/fuzztest/displaymanager_fuzzer/displaymanager_fuzzer.cpp index 5b6c8adb..90a094f5 100644 --- a/dm/test/fuzztest/displaymanager_fuzzer/displaymanager_fuzzer.cpp +++ b/dm/test/fuzztest/displaymanager_fuzzer/displaymanager_fuzzer.cpp @@ -15,6 +15,7 @@ #include "displaymanager_fuzzer.h" +#include #include "display_manager.h" namespace OHOS ::Rosen { @@ -45,8 +46,7 @@ size_t GetObject(T &object, const uint8_t *data, size_t size) if (objectSize > size) { return 0; } - std::memcpy(&object, data, objectSize); - return objectSize; + return memcpy_s(&object, objectSize, data, objectSize) == EOK ? objectSize : 0; } bool DisplayFuzzTest(const uint8_t* data, size_t size) diff --git a/dm/test/fuzztest/displaymanageripc_fuzzer/displaymanageripc_fuzzer.cpp b/dm/test/fuzztest/displaymanageripc_fuzzer/displaymanageripc_fuzzer.cpp index 1e0ad7c1..3f4fc1f7 100644 --- a/dm/test/fuzztest/displaymanageripc_fuzzer/displaymanageripc_fuzzer.cpp +++ b/dm/test/fuzztest/displaymanageripc_fuzzer/displaymanageripc_fuzzer.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include "display_manager_interface.h" @@ -33,8 +34,7 @@ size_t GetObject(T &object, const uint8_t *data, size_t size) if (objectSize > size) { return 0; } - std::memcpy(&object, data, objectSize); - return objectSize; + return memcpy_s(&object, objectSize, data, objectSize) == EOK ? objectSize : 0; } std::pair, sptr> GetProxy() diff --git a/dm/test/fuzztest/screen_fuzzer/screen_fuzzer.cpp b/dm/test/fuzztest/screen_fuzzer/screen_fuzzer.cpp index 0facdf93..a9442345 100644 --- a/dm/test/fuzztest/screen_fuzzer/screen_fuzzer.cpp +++ b/dm/test/fuzztest/screen_fuzzer/screen_fuzzer.cpp @@ -16,6 +16,7 @@ #include "screen_fuzzer.h" #include +#include #include "display_manager.h" #include "display.h" @@ -31,8 +32,7 @@ size_t GetObject(T &object, const uint8_t *data, size_t size) if (objectSize > size) { return 0; } - std::memcpy(&object, data, objectSize); - return objectSize; + return memcpy_s(&object, objectSize, data, objectSize) == EOK ? objectSize : 0; } bool ScreenFuzzTest(const uint8_t *data, size_t size) diff --git a/dm/test/fuzztest/screenmanager_fuzzer/screenmanager_fuzzer.cpp b/dm/test/fuzztest/screenmanager_fuzzer/screenmanager_fuzzer.cpp index 737d74e7..0ce9ff02 100644 --- a/dm/test/fuzztest/screenmanager_fuzzer/screenmanager_fuzzer.cpp +++ b/dm/test/fuzztest/screenmanager_fuzzer/screenmanager_fuzzer.cpp @@ -16,6 +16,7 @@ #include "screenmanager_fuzzer.h" #include +#include #include "dm_common.h" #include "screen.h" @@ -51,8 +52,7 @@ size_t GetObject(T &object, const uint8_t *data, size_t size) if (objectSize > size) { return 0; } - std::memcpy(&object, data, objectSize); - return objectSize; + return memcpy_s(&object, objectSize, data, objectSize) == EOK ? objectSize : 0; } bool ScreenPowerFuzzTest(const uint8_t *data, size_t size) diff --git a/wm/test/fuzztest/windowipc_fuzzer/windowipc_fuzzer.cpp b/wm/test/fuzztest/windowipc_fuzzer/windowipc_fuzzer.cpp index 528d7bae..07d78dac 100644 --- a/wm/test/fuzztest/windowipc_fuzzer/windowipc_fuzzer.cpp +++ b/wm/test/fuzztest/windowipc_fuzzer/windowipc_fuzzer.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include "zidl/window_manager_proxy.h" @@ -33,8 +34,7 @@ size_t GetObject(T &object, const uint8_t *data, size_t size) if (objectSize > size) { return 0; } - std::memcpy(&object, data, objectSize); - return objectSize; + return memcpy_s(&object, objectSize, data, objectSize) == EOK ? objectSize : 0; } std::pair, sptr> GetProxy() diff --git a/wm/test/fuzztest/windowscene_fuzzer/windowscene_fuzzer.cpp b/wm/test/fuzztest/windowscene_fuzzer/windowscene_fuzzer.cpp index 20c7804c..c0faa60d 100644 --- a/wm/test/fuzztest/windowscene_fuzzer/windowscene_fuzzer.cpp +++ b/wm/test/fuzztest/windowscene_fuzzer/windowscene_fuzzer.cpp @@ -13,6 +13,10 @@ * limitations under the License. */ +#include "windowscene_fuzzer.h" + +#include + #include "display_manager.h" #include "window.h" #include "window_manager.h" @@ -55,8 +59,7 @@ size_t GetObject(T &object, const uint8_t *data, size_t size) if (objectSize > size) { return 0; } - std::memcpy(&object, data, objectSize); - return objectSize; + return memcpy_s(&object, objectSize, data, objectSize) == EOK ? objectSize : 0; } size_t InitWindowOption1(WindowOption &windowOption, const uint8_t *data, size_t size)