Fixed crash when loading glTFs with data uri images

CesiumGS · Nov 8, 2023 · 3f5ce9e · 3f5ce9e
1 parent d3a2bbf
commit 3f5ce9e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,11 @@
 # Change Log
 
+### v0.30.0 - 2023-12-01
+
+##### Fixes :wrench:
+
+- Fixed crash when loading a glTF with data uri images.
+
 ### v0.29.0 - 2023-11-01
 
 ##### Breaking Changes :mega:

diff --git a/CesiumGltfReader/src/GltfReader.cpp b/CesiumGltfReader/src/GltfReader.cpp
@@ -252,6 +252,11 @@ void postprocess(
         continue;
       }
 
+      // Image has already been decoded
+      if (!image.cesium.pixelData.empty()) {
+        continue;
+      }
+
       const BufferView& bufferView =
           Model::getSafe(model.bufferViews, image.bufferView);
       const Buffer& buffer = Model::getSafe(model.buffers, bufferView.buffer);

diff --git a/CesiumGltfReader/src/decodeDataUrls.cpp b/CesiumGltfReader/src/decodeDataUrls.cpp
@@ -126,10 +126,13 @@ void decodeDataUrls(
 
     ImageReaderResult imageResult =
         reader.readImage(decoded.value().data, options.ktx2TranscodeTargets);
-    if (imageResult.image) {
-      image.cesium = std::move(imageResult.image.value());
+
+    if (!imageResult.image) {
+      continue;
     }
 
+    image.cesium = std::move(imageResult.image.value());
+
     if (options.clearDecodedDataUrls) {
       image.uri.reset();
     }