[vala/0.46] vala: Don't process arguments of MethodCall if error is set



commit b54015f60e45e59e0a9425c12cbb76d859731167
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Tue Feb 18 18:35:40 2020 +0100

    vala: Don't process arguments of MethodCall if error is set
    
    This caused criticals like:
    
      vala_method_get_closure: assertion 'self != NULL' failed

 tests/Makefile.am                                      | 1 +
 tests/semantic/methodcall-invalid-argument-lambda.test | 8 ++++++++
 vala/valamethodcall.vala                               | 7 +++++--
 3 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9c18a40d9..759106566 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -793,6 +793,7 @@ TESTS = \
        semantic/method-virtual.test \
        semantic/method-virtual-body.test \
        semantic/methodcall-field-initializer-throws.test \
+       semantic/methodcall-invalid-argument-lambda.test \
        semantic/methodcall-void-expression.test \
        semantic/methodcall-yield-with-begin.test \
        semantic/objectcreation-abstract-class.test \
diff --git a/tests/semantic/methodcall-invalid-argument-lambda.test 
b/tests/semantic/methodcall-invalid-argument-lambda.test
new file mode 100644
index 000000000..7239c0c6c
--- /dev/null
+++ b/tests/semantic/methodcall-invalid-argument-lambda.test
@@ -0,0 +1,8 @@
+Invalid Code
+
+void foo (int i) {
+}
+
+void main () {
+       foo (() => {});
+}
diff --git a/vala/valamethodcall.vala b/vala/valamethodcall.vala
index 7d4117e69..5996e7a55 100644
--- a/vala/valamethodcall.vala
+++ b/vala/valamethodcall.vala
@@ -478,7 +478,10 @@ public class Vala.MethodCall : Expression {
 
                bool force_lambda_method_closure = false;
                foreach (Expression arg in get_argument_list ()) {
-                       arg.check (context);
+                       if (!arg.check (context)) {
+                               error = true;
+                               continue;
+                       }
 
                        if (arg is LambdaExpression && ((LambdaExpression) arg).method.closure) {
                                force_lambda_method_closure = true;
@@ -486,7 +489,7 @@ public class Vala.MethodCall : Expression {
                }
                // force all lambda arguments using the same closure scope
                // TODO https://gitlab.gnome.org/GNOME/vala/issues/59
-               if (force_lambda_method_closure) {
+               if (!error && force_lambda_method_closure) {
                        foreach (Expression arg in get_argument_list ()) {
                                unowned LambdaExpression? lambda = arg as LambdaExpression;
                                if (lambda != null && lambda.method.binding != MemberBinding.STATIC) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]