From 3156779b1ab6e5683ff1c0cdb97abc7583311cb2 Mon Sep 17 00:00:00 2001
From: Brandon DeRosier <bdero@google.com>
Date: Fri, 16 Dec 2022 01:27:23 -0800
Subject: [PATCH] Fix SceneC crash for nodes with children

---
 impeller/fixtures/BUILD.gn               |   6 +++++-
 impeller/fixtures/two_triangles.glb      | Bin 0 -> 3376 bytes
 impeller/scene/importer/importer_gltf.cc |   2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 impeller/fixtures/two_triangles.glb

diff --git a/impeller/fixtures/BUILD.gn b/impeller/fixtures/BUILD.gn
index a52d020d65bfb..7c8fe01a79e2f 100644
--- a/impeller/fixtures/BUILD.gn
+++ b/impeller/fixtures/BUILD.gn
@@ -34,7 +34,10 @@ impeller_shaders("shader_fixtures") {
 }
 
 scenec("scene_fixtures") {
-  geometry = [ "flutter_logo.glb" ]
+  geometry = [
+    "flutter_logo.glb",
+    "two_triangles.glb",
+  ]
   type = "gltf"
 }
 
@@ -79,6 +82,7 @@ test_fixtures("file_fixtures") {
     "table_mountain_py.png",
     "table_mountain_pz.png",
     "test_texture.frag",
+    "two_triangles.glb",
     "types.h",
     "wtf.otf",
   ]
diff --git a/impeller/fixtures/two_triangles.glb b/impeller/fixtures/two_triangles.glb
new file mode 100644
index 0000000000000000000000000000000000000000..3937ac6969769d9b2c5f274ecb6f72c541a40a26
GIT binary patch
literal 3376
zcmb_fO>g5w7<RcLF8lx#%?;!Rk3aHt>87E(WN8zWM7u~)1x_+e4F0Ibla^H!ZGHoH
zu1I@<3wN&kgZ(o|<(aV)r*_+Q5UwrHyfg3nJnz@Uo%^HbA8DFqe4=URA8XpnVZXN`
zZX7c~S}QVVA>*!yIBAh@7CZ{0xH5-I<<w{4jPXkM%YNm?s@he%Npy0<c<e<XHk(z0
ztaTDkVSu!ZbQF`;ctt`tfQ$^)noh!K#^i!^xxUP1yKSTB8kTt^T%k;l4PdFuHms&&
zIgY6tRmV`5)2tbG&9)o*@m5A@(=?i9qglhYye0tSsq2Hzm|{7x+sq78Y!KWHV}FOP
zAJgjAq~jR%1~naaY}9q*a;>k(bm93k&JcsKA>B!QJ&lBjg8P1eVV+LL+Q>ZlpB$0o
z0v0b+Hd0z6?z!RINB9wkpFEH@az2>43_-fR%>!2~IU_Pr7&55)Nls_ca^kb0H)Au>
z5`4*aN&`rAay{V}Ot`-9O$X6(z6e<i#TA*jG3!Kr#GkuURc0~|_>-tXs<2%`74fa^
zPF8i+lJevDFE~Rs4q*WFLm4Qx@j}({u5vre36sFw3q0Z7q>HW)+?y<goUX{X{b6_1
z?e|nxMrYr3`u)LI-y5Vwb<*n(F52g$W$NT*zuOxPrQFiV>$C2QualX*)`=I+ys5P2
zWJyUA`50DBC;M3S46Ct^)x3vAQ5zW;1;K3zfbCi}udJb@9=uSV1?&{$E?hXQ2vT_R
zW8{TG?m>(ZwTCLponm(!@x;<(d3DA3E05i(7)_(#Itp1RMsKdswhlGn%rshtIIj?!
z!2Ma-POJyAq{qip_Epl`^%`{=)W(UR;Ds_mUY&I;99JmEJuo=<0kBNlENH{k(%MCA
zcv93>gtm@m*meQien|UXn4Z!`85OY=p&a(G(>`wx3g`-`RFbS*QgTVdxsD3Ss20P7
z!YxvL#L;4kQ0t|&i`Zz6qIT&NQ5<GP^+%`|Gc3EWsD40_WGfa8WcXN41AoyT0UwFT
zdSkyaRZ~vh2zJiGxxlZB1tW6azq(Q%5pYzvd@jEyEW24Vvo<TJnkd|TRcWfMZXULF
z0Im$iJ}y2LO5@^F<DM=xASg>Z7b@!HfUPHjm3Nrd5WTX%`AD0_0pZFco6=fY<b15n
zLlTt_wpo{TTC%!w!M4nt%TEQHnz=MvW+Ur~v>*1Gz;<f*MXXdRe;;YuX}5<j?9EB?
zXdAr$%Ep@Z&)r+hrCeTe-$U<x*;C{E+K1;yn*0x7x9=H78#%kXd;1Kp4Q|OV9b@z#
zIU*F=_Q`BWd-B@)oy>~!gynCy@BfsWaZ66P61`NeBuBe7<;O+|6CK2Mb8@8p@C9V=
m@NB^69ri=E`Bd)1{PRC<Uw<ZLavk@tzu&(91!LfDPW}bJJ+Get

literal 0
HcmV?d00001

diff --git a/impeller/scene/importer/importer_gltf.cc b/impeller/scene/importer/importer_gltf.cc
index 74b7e57f579f4..b16c687270389 100644
--- a/impeller/scene/importer/importer_gltf.cc
+++ b/impeller/scene/importer/importer_gltf.cc
@@ -189,7 +189,7 @@ static void ProcessNode(const tinygltf::Model& gltf,
   /// Children.
   ///
 
-  for (size_t node_i = 0; node_i < out_node.children.size(); node_i++) {
+  for (size_t node_i = 0; node_i < in_node.children.size(); node_i++) {
     auto child = std::make_unique<fb::NodeT>();
     ProcessNode(gltf, gltf.nodes[in_node.children[node_i]], *child);
     out_node.children.push_back(std::move(child));