Updated next release date

Synchronize cmake macros with yggcpp
Fix undefined behavior errors

Author: langmm

CHANGELOG.md

@@ -5,13 +5,14 @@ Because YggdrasilRapidJSON continues to merge updates from RapidJSON, the RapidJ
 
 ## X.X.X.X - XXXX-XX-XX
 
-## 1.1.0.4 - 2026-06-25
+## 1.1.0.4 - 2026-07-06
 
 ### Bug fixes
 * Fix bug where version could not be set in the conda recipe build since it is created from a tar instead of the git repo
 * Fix bug where asan flags were added to list that could be used for Fortran, but are only valid for C or CXX
 * Fix bug where string without encoding specified did not validate against a schema specifying ASCII encoding
 * Fix bug in ObjWavefront get_int_array where dec parameter was not passed at the correct position resulting in arrays that were 1 indexed even when dec was true
+* Fix places where undefined behavior was possible with use of pointer allocator
 
 ### Maintenance
 * Update names of flag/library lists set based on options to adhere to pattern of <PREFIX>_PUBLIC/PRIVATE_<SUFFIX>

YggdrasilRapidJSONMacros.cmake

@@ -78,27 +78,27 @@ function(yggdrasil_rapidjson_config_vars PREFIX)
   set(${PREFIX}_CONFIG_VARS ${${PREFIX}_CONFIG_VARS} PARENT_SCOPE)
 endfunction()
 
-macro(yggdrasil_rapidjson_config_init PREFIX)
+function(yggdrasil_rapidjson_config_init PREFIX)
   yggdrasil_rapidjson_config_vars(${PREFIX})
   foreach(var IN LISTS ${PREFIX}_CONFIG_VARS)
-    set(${var})
+    set(${var} "" PARENT_SCOPE)
   endforeach()
-endmacro()
+endfunction()
 
-macro(yggdrasil_rapidjson_config_cleanup PREFIX)
+function(yggdrasil_rapidjson_config_cleanup PREFIX)
   if(${PREFIX}_CONFIG_VARS)
     foreach(var IN LISTS ${PREFIX}_CONFIG_VARS)
-      unset(${var})
+      unset(${var} PARENT_SCOPE)
     endforeach()
-    unset(${PREFIX}_CONFIG_VARS)
+    unset(${PREFIX}_CONFIG_VARS PARENT_SCOPE)
   endif()
-endmacro()
+endfunction()
 
-macro(yggdrasil_rapidjson_config_show PREFIX LEVEL)
+function(yggdrasil_rapidjson_config_show PREFIX LEVEL)
   foreach(var IN LISTS ${PREFIX}_CONFIG_VARS)
     message(${LEVEL} "${var} = ${${var}}")
   endforeach()
-endmacro()
+endfunction()
 
 function(yggdrasil_rapidjson_config_accum PREFIX)
   foreach(suffix LIBRARIES INCLUDE_DIRS COMPILE_FLAGS LINK_FLAGS)
@@ -384,12 +384,13 @@ macro(yggdrasil_rapidjson_options_config OUTPUT_PREFIX)
     endforeach()
   endif()
   if(YGGDRASIL_RAPIDJSON_BUILD_UBSAN)
-    foreach(_yggdrasil_rapidjson_asan_tool GNU Clang)
+    foreach(_yggdrasil_rapidjson_asan_tool GNU Clang AppleClang)
       list(
         APPEND ${OUTPUT_PREFIX}_${_yggdrasil_rapidjson_asan_tool}_ASAN_COMPILE_FLAGS
         -fsanitize=undefined
       )
     endforeach()
+    # Unsure why this is only set for AppleClang and -fsanitize=undefined was not being set
     list(APPEND ${OUTPUT_PREFIX}_AppleClang_ASAN_COMPILE_FLAGS
          -fsanitize=undefined-trap -fsanitize-undefined-trap-on-error)
   endif()
@@ -450,12 +451,14 @@ function(yggdrasil_rapidjson_gitversion OUTPUT_VARIABLE DEFAULT)
       COMMAND ${GIT_EXECUTABLE} describe --tags --dirty --match "v*"
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
+      ERROR_VARIABLE GIT_DESCRIBE_ERROR
       RESULT_VARIABLE GIT_DESCRIBE_ERROR_CODE
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     if(GIT_DESCRIBE_ERROR_CODE)
       message(STATUS "Could not locate a git tag, falling back to version ${DEFAULT}")
       set(${OUTPUT_VARIABLE} ${DEFAULT})
+      message(DEBUG "Git output: ${GIT_DESCRIBE_ERROR}")
     else()
       string(SUBSTRING "${GIT_DESCRIBE_VERSION}" 1 -1 GIT_DESCRIBE_VERSION)
       string(FIND "${GIT_DESCRIBE_VERSION}" "-" idx)

include/yggdrasil_rapidjson/pointer.h

@@ -451,7 +451,7 @@ class GenericPointer {
 	    nameBufferSkip += t->length;
 
         r.tokenCount_ = nCopy;
-        r.tokens_ = static_cast<Token *>(allocator_->Malloc(r.tokenCount_ * sizeof(Token) + nameBufferSize * sizeof(Ch)));
+        r.tokens_ = static_cast<Token *>(r.allocator_->Malloc(r.tokenCount_ * sizeof(Token) + nameBufferSize * sizeof(Ch)));
         r.nameBuffer_ = reinterpret_cast<Ch *>(r.tokens_ + r.tokenCount_);
         if (nCopy > 0) {
             std::memcpy(r.tokens_, tokens_ + nSkip, nCopy * sizeof(Token));
@@ -749,7 +749,11 @@ class GenericPointer {
     //@}
 
     //! Get the allocator of this pointer.
-    Allocator& GetAllocator() { return *allocator_; }
+    Allocator& GetAllocator() {
+      if (!allocator_)
+          ownAllocator_ = allocator_ = YGGDRASIL_RAPIDJSON_NEW(Allocator)();
+      return *allocator_;
+    }
 
     //!@name Tokens
     //@{

include/yggdrasil_rapidjson/schema.h

@@ -13190,8 +13190,8 @@ class GenericSchemaValidator :
             AddErrorCode(error, code);
             AddErrorInstanceLocation(error, false);
             // When appending to a pointer ensure its allocator is used
-            PointerType schemaRef = GetInvalidSchemaPointer().Append(SchemaType::GetValidateErrorKeyword(kValidateErrorDependencies), &GetInvalidSchemaPointer().GetAllocator());
-            AddErrorSchemaLocation(error, schemaRef.Append(sourceName.GetString(), sourceName.GetStringLength(), &GetInvalidSchemaPointer().GetAllocator()));
+            PointerType schemaRef = GetInvalidSchemaPointer().Append(SchemaType::GetValidateErrorKeyword(kValidateErrorDependencies)); // , &GetInvalidSchemaPointer().GetAllocator());
+            AddErrorSchemaLocation(error, schemaRef.Append(sourceName.GetString(), sourceName.GetStringLength()));  // , &GetInvalidSchemaPointer().GetAllocator()));
             ValueType wrapper(kObjectType);
             wrapper.AddMember(ValueType(SchemaType::GetValidateErrorKeyword(code), GetStateAllocator()).Move(), error, GetStateAllocator());
             currentError_.AddMember(ValueType(sourceName, GetStateAllocator()).Move(), wrapper, GetStateAllocator());

run_tests.sh

@@ -1,15 +1,44 @@
 set -e
-INSTALL_DIR="$(pwd)/_install"
-# rm -rf build
-if [ ! -d build ]; then
-    mkdir build
+REBUILD=""
+BUILD_DIR=""
+INSTALL_DIR=""
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --rebuild )
+            REBUILD="TRUE"
+	    shift
+	    ;;
+        --build-dir )
+            BUILD_DIR="$2"
+	    shift
+	    shift # past argument with value
+	    ;;
+        --install-dir )
+            INSTALL_DIR="$2"
+	    shift
+	    shift # past argument with value
+	    ;;
+    esac
+done
+if [ ! -n "${BUILD_DIR}" ]; then
+    BUILD_DIR="$(pwd)/build"
+fi
+if [ ! -n "${INSTALL_DIR}" ]; then
+    INSTALL_DIR="$(pwd)/_install"
+fi
+if [ -n "$REBUILD" ]; then
+    if [ -d ${BUILD_DIR} ]; then
+        rm -rf ${BUILD_DIR}
+    fi
+fi
+if [ ! -d ${BUILD_DIR} ]; then
+    mkdir ${BUILD_DIR}
 fi
 if [ ! -d ${INSTALL_DIR} ]; then
     mkdir ${INSTALL_DIR}
 fi
-cd build
 
-cmake .. \
+cmake -B ${BUILD_DIR} -S $(pwd) \
       -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
       -DYGGDRASIL_RAPIDJSON_SKIP_VALGRIND_TESTS:BOOL=ON \
       -DYGGDRASIL_RAPIDJSON_CREATE_METASCHEMA_FULL:BOOL=ON \
@@ -23,28 +52,23 @@ cmake .. \
       -DYGGDRASIL_RAPIDJSON_BUILD_EXAMPLES:BOOL=ON \
       -DYGGDRASIL_RAPIDJSON_BUILD_DOC:BOOL=OFF
 # -DCMAKE_BUILD_TYPE=Debug
-# Install in local directory
 # -DCMAKE_INSTALL_PREFIX:FILEPATH=${INSTALL_DIR}
 
 # Tests
-cmake --build . --target=tests -- -j 8
-cmake --install . --prefix "${INSTALL_DIR}"
+cmake --build ${BUILD_DIR} --target=tests -- -j 8
+cd ${BUILD_DIR}
 ctest -R unittest --stop-on-failure
 # ctest -R perftest --stop-on-failure
 
 # Examples
-# cmake --build . --target=examples -- -j 8
-# ./bin/yggdrasil
-# ./bin/${example_name}
+# cmake --build ${BUILD_DIR} --target=examples -- -j 8
+# ${BUILD_DIR}/bin/yggdrasil
+# ${BUILD_DIR}/bin/${example_name}
 
 # Install
-# cmake --install .
+cmake --install ${BUILD_DIR} --prefix "${INSTALL_DIR}"
 
 
-# # cmake --build . -- -j 8
-# cmake --build . --target=tests -- -j 8
-# # ctest -C Debug --output-on-failure --verbose --stop-on-failure
-# ctest -R unittest --stop-on-failure
 # ctest -R coverage
 # # cmake .. -DYGGDRASIL_RAPIDJSON_SKIP_VALGRIND_TESTS=ON -DYGGDRASIL_RAPIDJSON_ENABLE_COVERAGE=ON -DCMAKE_BUILD_TYPE=Debug
 # # ctest -T Coverage