commit 7b9524cb96d846517fdf18dfb8cc9b438f9bce61
author Brian Osman <brianosman@google.com> Fri Feb 07 15:55:21 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 10 15:08:00 2020 +0000
tree be9da96843dea910a04e44823819b392e0f1b525
parent 7475ac0d37fb225cb8b2d193879b0500799650f0

Fix crash when editing particle scripts

If the scripts fail to produce valid bytecode, don't overwrite the
interpreter.

Change-Id: Icd008a5188166ce086ff4df87dcb2b43d7f80820
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269487
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

modules/particles/src/SkParticleEffect.cpp

diff --git a/modules/particles/src/SkParticleEffect.cpp b/modules/particles/src/SkParticleEffect.cpp
index 02e2e15..133222d 100644
--- a/modules/particles/src/SkParticleEffect.cpp
+++ b/modules/particles/src/SkParticleEffect.cpp
@@ -161,14 +161,18 @@
     particleCode.append(fParticleCode.c_str());
 
     auto effectProgram = buildProgram(effectCode);
-    fEffectProgram.fInterpreter.reset(new SkSL::Interpreter<INTERPRETER_WIDTH>(
-                                                                   std::move(effectProgram.first)));
-    fEffectProgram.fExternalValues.swap(effectProgram.second);
+    if (effectProgram.first) {
+        fEffectProgram.fInterpreter.reset(
+                new SkSL::Interpreter<INTERPRETER_WIDTH>(std::move(effectProgram.first)));
+        fEffectProgram.fExternalValues.swap(effectProgram.second);
+    }
 
     auto particleProgram = buildProgram(particleCode);
-    fParticleProgram.fInterpreter.reset(new SkSL::Interpreter<INTERPRETER_WIDTH>(
-                                                                 std::move(particleProgram.first)));
-    fParticleProgram.fExternalValues.swap(particleProgram.second);
+    if (particleProgram.first) {
+        fParticleProgram.fInterpreter.reset(
+                new SkSL::Interpreter<INTERPRETER_WIDTH>(std::move(particleProgram.first)));
+        fParticleProgram.fExternalValues.swap(particleProgram.second);
+    }
 }
 
 SkParticleEffect::SkParticleEffect(sk_sp<SkParticleEffectParams> params, const SkRandom& random)