Fix parseGltfCopyright (again).

CesiumGS · Feb 12, 2025 · b659f72 · b659f72
1 parent d085706
commit b659f72
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,11 @@
 # Change Log
 
+### v0.44.3 - 2025-02-12
+
+##### Fixes :wrench:
+
+- Fixed another bug in `GltfUtilities::parseGltfCopyright` that could cause it to crash or produce incorrect results.
+
 ### v0.44.2 - 2025-02-10
 
 ##### Fixes :wrench:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,7 +87,7 @@ endif()
 include("cmake/defaults.cmake")
 
 project(cesium-native
-    VERSION 0.44.2
+    VERSION 0.44.3
     LANGUAGES CXX C
 )
 

diff --git a/CesiumGltfContent/src/GltfUtilities.cpp b/CesiumGltfContent/src/GltfUtilities.cpp
@@ -295,8 +295,13 @@ std::string_view trimWhitespace(const std::string_view& s) {
   size_t end = s.find_last_not_of(" \t");
   if (end == std::string::npos)
     return {};
-  size_t start = s.find_first_not_of(" \t", 0, end + 1);
-  return s.substr(start, end - start + 1);
+
+  std::string_view trimmedRight = s.substr(0, end + 1);
+  size_t start = trimmedRight.find_first_not_of(" \t");
+  if (start == std::string::npos)
+    return {};
+
+  return trimmedRight.substr(start);
 }
 } // namespace
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cesium-native",
-  "version": "0.44.2",
+  "version": "0.44.3",
   "description": "Cesium 3D Geospatial for C++",
   "main": "index.js",
   "directories": {