From 01b2088dd3a4fea90d472061fc18ef202d9b1031 Mon Sep 17 00:00:00 2001 From: Malcolm Tyrrell Date: Thu, 5 Nov 2020 15:02:41 +0000 Subject: [PATCH] A missing bufferview was causing a crash. --- code/AssetLib/glTF2/glTF2Asset.inl | 33 ++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/code/AssetLib/glTF2/glTF2Asset.inl b/code/AssetLib/glTF2/glTF2Asset.inl index badf60f5c..396b1adf3 100644 --- a/code/AssetLib/glTF2/glTF2Asset.inl +++ b/code/AssetLib/glTF2/glTF2Asset.inl @@ -289,7 +289,8 @@ Ref LazyDict::Retrieve(unsigned int i) { // Unique ptr prevents memory leak in case of Read throws an exception auto inst = std::unique_ptr(new T()); - inst->id = std::string(mDictId) + "_" + to_string(i); + // Try to make this human readable so it can be used in error messages. + inst->id = std::string(mDictId) + "[" + to_string(i) + "]"; inst->oIndex = i; ReadMember(obj, "name", inst->name); inst->Read(obj, mAsset); @@ -637,15 +638,18 @@ inline void Accessor::Read(Value &obj, Asset &r) { const char *typestr; type = ReadMember(obj, "type", typestr) ? AttribType::FromString(typestr) : AttribType::SCALAR; - // Check length - unsigned long long byteLength = (unsigned long long)GetBytesPerComponent() * (unsigned long long)count; - if ((byteOffset + byteLength) > bufferView->byteLength || (bufferView->byteOffset + byteOffset + byteLength) > bufferView->buffer->byteLength) { - const uint8_t val_size = 64; + if (bufferView) + { + // Check length + unsigned long long byteLength = (unsigned long long)GetBytesPerComponent() * (unsigned long long)count; + if ((byteOffset + byteLength) > bufferView->byteLength || (bufferView->byteOffset + byteOffset + byteLength) > bufferView->buffer->byteLength) { + const uint8_t val_size = 64; - char val[val_size]; + char val[val_size]; - ai_snprintf(val, val_size, "%llu, %llu", (unsigned long long)byteOffset, (unsigned long long)byteLength); - throw DeadlyImportError("GLTF: Accessor with offset/length (", val, ") is out of range."); + ai_snprintf(val, val_size, "%llu, %llu", (unsigned long long)byteOffset, (unsigned long long)byteLength); + throw DeadlyImportError("GLTF: Accessor with offset/length (", val, ") is out of range."); + } } if (Value *sparseValue = FindObject(obj, "sparse")) { @@ -737,13 +741,24 @@ inline void CopyData(size_t count, } } } + +inline std::string getContextForErrorMessages(const std::string& id, const std::string& name) +{ + std::string context = id; + if (!name.empty()) + { + context += " (\"" + name + "\")"; + } + return context; +} + } // namespace template void Accessor::ExtractData(T *&outData) { uint8_t *data = GetPointer(); if (!data) { - throw DeadlyImportError("GLTF2: data is nullptr."); + throw DeadlyImportError("GLTF2: data is nullptr when extracting data from ", getContextForErrorMessages(id, name)); } const size_t elemSize = GetElementSize();