commit c432b0ca8a5022d86f0ccf2efd1064ed9fce2e53
author Ethan Nicholas <ethannicholas@google.com> Tue Jul 18 13:22:37 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 18 17:44:34 2017 +0000
tree 404b91918e85034437bc3bdf87be39ecb0f0c3b1
parent 140635504c40b99debb0e714aca8d90652aa6aff

fixed use-after-free in sksl switch statements

Bug: skia:
Change-Id: I66ef1cd2af9c654bfa40a71b2218cfde49f3a54e
Reviewed-on: https://skia-review.googlesource.com/24329
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLCompiler.cpp

diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 3a037e7..0584ff1 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -846,7 +846,7 @@
     for (const auto& s : statementPtrs) {
         statements.push_back(std::move(*s));
     }
-    return std::unique_ptr<Statement>(new Block(Position(), std::move(statements)));
+    return std::unique_ptr<Statement>(new Block(Position(), std::move(statements), s->fSymbols));
 }
 
 void Compiler::simplifyStatement(DefinitionMap& definitions,