GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-15 12:56:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Loading a GLB file without BIN data fails. Fixes #49.

Browse Source
This commit is contained in:
Syoyo Fujita 2018-03-15 22:01:18 -05:00
parent d42767e63f
commit e69069d53c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tiny_gltf.h
View File

@ -3208,7 +3208,10 @@ bool TinyGLTF::LoadBinaryFromMemory(Model *model, std::string *err,
memcpy(&model_format, bytes + 16, 4); memcpy(&model_format, bytes + 16, 4);
swap4(&model_format); swap4(&model_format);
if ((20 + model_length >= size) || (model_length < 1) || // In case the Bin buffer is not present, the size is exactly 20 + size of
// JSON contents,
// so use "greater than" operator.
if ((20 + model_length > size) || (model_length < 1) ||
(model_format != 0x4E4F534A)) { // 0x4E4F534A = JSON format. (model_format != 0x4E4F534A)) { // 0x4E4F534A = JSON format.
if (err) { if (err) {
(*err) = "Invalid glTF binary."; (*err) = "Invalid glTF binary.";
@ -3739,7 +3742,8 @@ bool TinyGLTF::WriteGltfSceneToFile(
json buffers; json buffers;
for (unsigned int i = 0; i < model->buffers.size(); ++i) { for (unsigned int i = 0; i < model->buffers.size(); ++i) {
json buffer; json buffer;
SerializeGltfBuffer(model->buffers[i], buffer, binSaveFilePath, binFilename); SerializeGltfBuffer(model->buffers[i], buffer, binSaveFilePath,
binFilename);
buffers.push_back(buffer); buffers.push_back(buffer);
} }
output["buffers"] = buffers; output["buffers"] = buffers;