From 39abfb5f91337fdce12e7f99100bc463ab361995 Mon Sep 17 00:00:00 2001
From: Syoyo Fujita <syoyo@lighttransport.com>
Date: Wed, 11 Jul 2018 02:46:52 +0900
Subject: [PATCH] Consider Data URI buffers in binary. Fixes #79.

---
 models/box01.glb | Bin 0 -> 3816 bytes
 test_runner.py   |   2 +-
 tests/tester.cc  |  16 ++++++++++++++++
 tiny_gltf.h      |  18 ++++++++++++++----
 4 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 models/box01.glb

diff --git a/models/box01.glb b/models/box01.glb
new file mode 100644
index 0000000000000000000000000000000000000000..7477e897f06a5ae6d09311da18ca66a3f4bcead0
GIT binary patch
literal 3816
zcmb_e>rxvx6jsvombU5rehH($HDv8Il(>_IV*`m(z}(6-!(>|7$jeUcUC*wJ!!VxV
zN8c-boIXa+kyc)@m_Sn2BaXgv`_7S;m4e>x>P^Pjzjqk>`!-`wc3K-JTy#1zP2(ix
zwfz&`9(KDj*$d@}*Sr#MA1m4Fc2lV|?8N;+9LY%S9uFk1&6g{FiFe{*gl2!C#QWko
zX7S6<a2iH9^>C)NFW+gv8f^1%=`2b43M81>l2j~-H#c9(#)NH_6q7$W_1;RuKSzw2
zF756tan{JxY`6}uovp&hSgT0&DxdH`Mlum9PIwI$^jORWxNj@Z2XUf!i66-%4P#te
zUYYZ-DQCyr9h~gmnv4Q<$ZJ2H?^lT=ppEsb_ZR$pU(SX4i`BE;Q7$*Q@+!gAd0f@2
zMpww$UD(AczLjUAaqY}ooAr;ctZlmN-N*Q065?_l2qkJ_FzAIHp>PH7#T_NpY^o9|
z`aictDi^9H0H^~r0Roci&;WP>utnfkfZw1oLM1$fdH@>$9as)vlZ-1{umkmVSOwUF
z`cqgPk<(xBD1bK9NAP$HB-9r%J;2cj|E%fxJ;Iv>tnJGMyMuFkBahd1gY*23UGq71
zC!gkj3BHUkk9YDre0hIGJLvlJdJQi6=eTGuVyEAi^poc+`WNdfVyE8XdKa;?zxn!^
zc-nLQG+!SFrazkrirC~g^-r9dIWGENhA+!kv<IgD3H9~ihWUS)WWIi^_shwDy?7Zm
z1N^+u{xxX-P5q<gDt<)t`w-CkxkdJM_>syW+%)@*{x%-{Z9L|i8n5kj9k1<>=Z6Wu
z$*=8A&8PVTswd;$!Wv9Ge(11tsz=*(e)>9Q_38Jyp4n}GhF{mO`*ZA%s2*bn;?wcA
zKmGl~{vErHckH@8vOjpBPtd+lG6_Y`oCC5SrfGO2S4BskrTgBThc^a2@W>dnlXa;?
z508WGco-Z;cnRV)yqn-b(1?3+;>1mE8YO+R$-=Ay<>ZOYk!yY5qo?eb%f44BFV2tY
znD5K<P?`z{N!Sk+mS~_*Dhb;|Meu}gw6@n_jo0v~-E8eNcblyZUc<}M?#l0tR%?6t
z4-XG+JpRMzAjAutKD6xu7!V)e6|FjcMywG6!$SPpp2SL@gLF&FSEf{+qdQyL5j~9F
zM?{)Ts}d2Vy(v+eBkkbDMW@y?Ll=oY>iB`|ieXRfXqUVk4+F<Dk8d$nZ*Jht^ai_$
zzZ>ig_6~cO-NN5(_9lCez0cml-v{h%c87h)K4KrUPuQpIGxj<Af_=%pVqddw*thIE
z_C5Q7-NiiYMK&Iyq(Rt~R&V7rJL%j(zC}#Biw60U&B|$Wve{wn7L#;!G%sT7WA)Q~
ztga|uOsUQ4TuE_+tt`%6Og=QS=kyik7x_}EQ{u=TJHN=^)l-P|zi57${h~Nm?{faH
z`IJ6go~zFP`33vNwV%O3lJHW7NfKrmCaL{VH-qz2ltq8iFJ*q@PuP{y;@MKhgOdCy
kua2`Ab$^l`2kDm_Y4s#Y&oK5BrRK@7)swV(l1mT&15*fx(EtDd

literal 0
HcmV?d00001

diff --git a/test_runner.py b/test_runner.py
index 26345db..fd96ad9 100644
--- a/test_runner.py
+++ b/test_runner.py
@@ -28,7 +28,7 @@ def run(filename):
         p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (stdout, stderr) = p.communicate()
     except:
-        print "Failed to execute: ", cmd
+        print("Failed to execute: ", cmd)
         raise
 
     if p.returncode != 0:
diff --git a/tests/tester.cc b/tests/tester.cc
index 1cee2b4..377ea0e 100644
--- a/tests/tester.cc
+++ b/tests/tester.cc
@@ -1,5 +1,6 @@
 #define TINYGLTF_IMPLEMENTATION
 #define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "tiny_gltf.h"
 
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
@@ -24,3 +25,18 @@ TEST_CASE("parse-error", "[parse]") {
 
 }
 
+TEST_CASE("datauri-in-glb", "[issue-79]") {
+
+  tinygltf::Model model;
+  tinygltf::TinyGLTF ctx;
+  std::string err;
+
+  bool ret = ctx.LoadBinaryFromFile(&model, &err, "../models/box01.glb");
+  if (!err.empty()) {
+    std::cerr << err << std::endl;
+  }
+    
+  REQUIRE(true == ret);
+}
+
+
diff --git a/tiny_gltf.h b/tiny_gltf.h
index 40f1d38..4fab08d 100644
--- a/tiny_gltf.h
+++ b/tiny_gltf.h
@@ -2260,11 +2260,21 @@ static bool ParseBuffer(Buffer *buffer, std::string *err, const json &o,
 
   size_t bytes = static_cast<size_t>(byteLength);
   if (is_binary) {
-    // Still binary glTF accepts external dataURI. First try external resources.
-
+    // Still binary glTF accepts external dataURI. 
     if (!buffer->uri.empty()) {
-      // External .bin file.
-      LoadExternalFile(&buffer->data, err, buffer->uri, basedir, bytes, true, fs);
+      // First try embedded data URI.
+      if (IsDataURI(buffer->uri)) {
+        std::string mime_type;
+        if (!DecodeDataURI(&buffer->data, mime_type, buffer->uri, bytes, true)) {
+            if (err) {
+                (*err) += "Failed to decode 'uri' : " + buffer->uri + " in Buffer\n";
+            }
+            return false;
+        }
+      } else { 
+        // External .bin file.
+        LoadExternalFile(&buffer->data, err, buffer->uri, basedir, bytes, true, fs);
+      }
     } else {
       // load data from (embedded) binary data