[vala/0.40] vala: Don't process arguments of MethodCall if error is set
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/0.40] vala: Don't process arguments of MethodCall if error is set
- Date: Thu, 5 Mar 2020 18:44:48 +0000 (UTC)
commit 42b95ac858139365fd9852ab85e98269e54ff877
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 | 5 ++++-
3 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fbaa87d5a..1d2ca29a4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -720,6 +720,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 0e7b13b9f..0595e98da 100644
--- a/vala/valamethodcall.vala
+++ b/vala/valamethodcall.vala
@@ -452,7 +452,10 @@ public class Vala.MethodCall : Expression {
}
foreach (Expression arg in get_argument_list ()) {
- arg.check (context);
+ if (!arg.check (context)) {
+ error = true;
+ continue;
+ }
}
if (ret_type is VoidType) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]