From b74e879a3f8ecbc88662920788570251c19ab822 Mon Sep 17 00:00:00 2001
From: Brandon DeRosier <bdero@google.com>
Date: Fri, 16 Dec 2022 10:35:10 -0800
Subject: [PATCH] [Impeller] Fix SceneC crash for nodes with children
 (flutter/engine#38346)

---
 engine/src/flutter/impeller/fixtures/BUILD.gn    |   6 +++++-
 .../flutter/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 engine/src/flutter/impeller/fixtures/two_triangles.glb

diff --git a/engine/src/flutter/impeller/fixtures/BUILD.gn b/engine/src/flutter/impeller/fixtures/BUILD.gn
index a52d020d65..7c8fe01a79 100644
--- a/engine/src/flutter/impeller/fixtures/BUILD.gn
+++ b/engine/src/flutter/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/engine/src/flutter/impeller/fixtures/two_triangles.glb b/engine/src/flutter/impeller/fixtures/two_triangles.glb
new file mode 100644
index 0000000000000000000000000000000000000000..3937ac6969769d9b2c5f274ecb6f72c541a40a26
GIT binary patch
literal 3376
zcmYe#32|d$U|=xdWnl2(W?=9N_V=q+N-Qo;Em5+nR!UFJOD#$)$uCl}Qu59y%FoL$
zRsd;HaLP%|OGzzK@YMHLC^ObG(KE4B(orf)Eh^5;&r`BeGSV|ps?|{{PEO5BRkAXG
zvWk_gqN|ni5_40PtdxSmaym+R`6;O&3FFw>SOgEQEF`}`Nk^$Dza+5)Y;?4No{1$G
zm>3vani`v$8tEA5nHqqBsim2LiJ6Isg^n&v%+S!%$iULb!qQ9!Q)ev5VTn1ZN><T^
zItF@RV=XNa1{=oeD3uf?<`w6_ZP(E?)PosmYHDC^VQ6HUs%v1bV-Q=bQ>~Pok(rZH
zl$xhx6>R|W4#clc`6VU!xv2io#dHqB)dmQkP{|`8$K|FLXMke^8U-OmnTdJnIjO};
zI!eXanR!Z91|VffelXGj1p!pKV^MBmNoi545-6f_6H8KyG81z^QCF>$l3$vXlNy|v
zlA5AqRZ>)%ssoGWpwtv49i@V#BHz@K#GIVW<e>c0^o+dJ;$lz&OG+$Gb<WSpFLFyv
z1}8I6Jm?sJZOw&hfJqsEk^xjNTujfj7UX2y_PZCQrsk340s|dGQe6<MqXY_Da5{#k
zT<6lHRFK6*nYo!InPpJP#FCPt%%sv15Vu+>z(3eC#M9po94jHN5zhYpK`!wIN>+wC
zN`C%9zK%XhRz^BXUjCkbA;BPVV;!Y%S5J2j2+yQeM=3KeB{LahnyHQwEK;BmiOViC
z9VKMD%n^23Alqe$Vwa%-vSo&b$hH~Qf-^5D4MEaFW*(?4NOj80OYu!CDS|lA&`3uq
zD?c-@1f<4L2PuD`q^!i`<kaHg{34L5YNe#ow6xTsu*}qQa2O@$=N9DWrRJ4{R2HNv
zS(zFdndvAc=a=S{C|MbUoKykM%MjCZK}kAV*ASGiEWyCs%+S=r(8S2V5^Q}5*bt>K
zS7&1-P%=Wc%n)QQUds@=jWBc@k)RvXZewh^!486X6k)dshTSIEbfW|lKHa9+bb}p)
zW_Pf&qmN?{hV5XB@P=D%A|#TGp#?51QqUsJh+q_%V{<Clel(|sxjJJ;kp&65F{8*5
zn{J|`$j|_rb{tN}jA2mj!^{aJL=q?~Vj6(3-$+LZnnrvbLrlO0J|b@*XH0OWOsXtN
z^-0Z3FUe4{GB(pu0`dLR(!h-f10AK3#G-Uid&1bn(#!~v%`mhYnV@O~8AYsKkXmGG
z%}B5p6d1^QEzO8`vxx<&n+**th}Vo3REDN#78~OUEOZYWnwb!9F?vWF8ITZM=r$XH
zOd~d)(8Jn@l!!tPY$J0}Iwdl7p#`?F5t^6r1-79PS~MFQS%4ZrkURm+4@jB7#MG=d
zwpKww;RGWCgOjHp0|P^YJp?l}FfcUiN3a<f{`{}s4^qGY1|W4H20D!_hL4RdN0`sZ
z0O|q2)j7c2^8bH5lnrt(1C$L{2U2Da;z9iaVS@b$Wumbe85kH~7*!8QJ<Pu#HVC8h
zA+B6jetiqbVn`Sw)Ir5T0t}4c@C7p)AZlT3keLnkj0_1{3=9k_L2`@?3@aHKKw=F-
hAXSVE44Ui9!{tC?AbAFchPms?uTNrNVAuk3GXTInub%(_

literal 0
HcmV?d00001

diff --git a/engine/src/flutter/impeller/scene/importer/importer_gltf.cc b/engine/src/flutter/impeller/scene/importer/importer_gltf.cc
index 74b7e57f57..b16c687270 100644
--- a/engine/src/flutter/impeller/scene/importer/importer_gltf.cc
+++ b/engine/src/flutter/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));