commit 537c8a7ad56db045632966af55fe98a701bd6409
author John Stiles <johnstiles@google.com> Fri Aug 27 11:07:09 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri Aug 27 16:27:15 2021 +0000
tree a3d06c9eb574bb4066ee7d2cc762a73aed8347e6
parent bb8cf5804c83b99aebbba102dc792fcaa89f9d2f

Fix assertion when returning intermediate types.

The fuzzer managed to trigger an assertion by returning an invalid type
from a void function. We were neglecting to clear out the expression
when reporting it as invalid, leaving it for `checkValid` to find later.

Change-Id: Icc152c867a3316fe994967e192601fb4d10da98f
Bug: oss-fuzz:37704
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442678
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLIRGenerator.cpp

diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp
index e85b8ea..cd5e239 100644
--- a/src/sksl/SkSLIRGenerator.cpp
+++ b/src/sksl/SkSLIRGenerator.cpp
@@ -801,6 +801,7 @@
                                     std::move(returnStmt.expression()), returnType));
                         } else {
                             // Returning something from a function with a void return type.
+                            returnStmt.setExpression(nullptr);
                             fIRGenerator->errorReporter().error(returnStmt.fOffset,
                                                      "may not return a value from a void function");
                         }