commit 07e3d1b076aff1700daf188cd8a00b25b9712af9
author Pavel Tsynk <36221942+TsynkPavel@users.noreply.github.com> Thu Sep 12 07:43:25 2024 +0700
committer GitHub <noreply@github.com> Wed Sep 11 17:43:25 2024 -0700
tree 72d8effcec8d50d16b4edafcc39d4910a1af5005
parent 871f0cc43bbd9ccf4e4a67df5a7751f53b49d99e

Fix deallocate for working on old compiers (#1478)

Co-authored-by: Jordan Bayles <bayles.jordan@gmail.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c958250..6104c5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,6 +93,12 @@
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Executable/dll output dir.")
 endif()
 
+include(CheckFunctionExists)
+check_function_exists(memset_s HAVE_MEMSET_S)
+if(HAVE_MEMSET_S)
+    add_definitions("-DHAVE_MEMSET_S=1")
+endif()
+
 if(JSONCPP_USE_SECURE_MEMORY)
     add_definitions("-DJSONCPP_USE_SECURE_MEMORY=1")
 endif()

include/json/allocator.h

diff --git a/include/json/allocator.h b/include/json/allocator.h
index f4fcc1c..459c34c 100644
--- a/include/json/allocator.h
+++ b/include/json/allocator.h
@@ -6,6 +6,7 @@
 #ifndef JSON_ALLOCATOR_H_INCLUDED
 #define JSON_ALLOCATOR_H_INCLUDED
 
+#include <algorithm>
 #include <cstring>
 #include <memory>
 
@@ -38,8 +39,16 @@
    * The memory block is filled with zeroes before being released.
    */
   void deallocate(pointer p, size_type n) {
-    // memset_s is used because memset may be optimized away by the compiler
+    // These constructs will not be removed by the compiler during optimization,
+    // unlike memset.
+#if defined(HAVE_MEMSET_S)
     memset_s(p, n * sizeof(T), 0, n * sizeof(T));
+#elif defined(_WIN32)
+    RtlSecureZeroMemory(p, n * sizeof(T));
+#else
+    std::fill_n(reinterpret_cast<volatile unsigned char*>(p), n, 0);
+#endif
+
     // free using "global operator delete"
     ::operator delete(p);
   }