From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 17 Nov 2021 17:46:22 +0000 (+0100)
Subject: vala: Check for unavailable value-type of variable initializer
X-Git-Tag: 0.55.1~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16840d25fb474f313e98989856fc315149f3b73e;p=thirdparty%2Fvala.git

vala: Check for unavailable value-type of variable initializer

Regression of 6690ea0e3c6f0d81d849e13548efc8c0809149cc

Fixes https://gitlab.gnome.org/GNOME/vala/issues/1253
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b7a40d46c..84af6bef1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -981,6 +981,7 @@ TESTS = \
 	semantic/assignment-same-variable.vala \
 	semantic/assignment-signal-incompatible-method.test \
 	semantic/assignment-signal-incompatible-type.test \
+	semantic/assignment-invalid-type.test \
 	semantic/cast-gvalue-unsupported.test \
 	semantic/cast-gvariant-unsupported.test \
 	semantic/cast-void-not-allowed.test \
@@ -1073,6 +1074,7 @@ TESTS = \
 	semantic/foreach-next-value-void.test \
 	semantic/foreach-next-void.test \
 	semantic/foreach-wrong-types.test \
+	semantic/initializer-invalid-type.test \
 	semantic/initializer-unknown-type.test \
 	semantic/interface-prerequisite-invalid.test \
 	semantic/interface-prerequisite-less-accessible.test \
diff --git a/tests/semantic/assignment-invalid-type.test b/tests/semantic/assignment-invalid-type.test
new file mode 100644
index 000000000..261c52ed0
--- /dev/null
+++ b/tests/semantic/assignment-invalid-type.test
@@ -0,0 +1,7 @@
+Invalid Code
+
+string bar;
+
+void main () {
+	bar = string;
+}
diff --git a/tests/semantic/initializer-invalid-type.test b/tests/semantic/initializer-invalid-type.test
new file mode 100644
index 000000000..2f8e91eaf
--- /dev/null
+++ b/tests/semantic/initializer-invalid-type.test
@@ -0,0 +1,5 @@
+Invalid Code
+
+void main () {
+	string foo = string;
+}
diff --git a/vala/valaassignment.vala b/vala/valaassignment.vala
index 46f9445a4..137361b28 100644
--- a/vala/valaassignment.vala
+++ b/vala/valaassignment.vala
@@ -297,6 +297,10 @@ public class Vala.Assignment : Expression {
 					Report.error (source_reference, "Assignment: Invalid assignment attempt");
 					return false;
 				}
+			} else if (ma.symbol_reference is Variable && right.value_type == null) {
+				error = true;
+				Report.error (source_reference, "Assignment: Invalid assignment attempt");
+				return false;
 			} else if (ma.symbol_reference is Variable) {
 				unowned Variable variable = (Variable) ma.symbol_reference;
 				unowned ArrayType? variable_array_type = variable.variable_type as ArrayType;
diff --git a/vala/valalocalvariable.vala b/vala/valalocalvariable.vala
index e6d15cf19..024b046fe 100644
--- a/vala/valalocalvariable.vala
+++ b/vala/valalocalvariable.vala
@@ -209,6 +209,10 @@ public class Vala.LocalVariable : Variable {
 					Report.error (source_reference, "expression type not allowed as initializer");
 					return false;
 				}
+			} else if (initializer.value_type == null) {
+				error = true;
+				Report.error (source_reference, "expression type not allowed as initializer");
+				return false;
 			}
 
 			if (!initializer.value_type.compatible (variable_type)) {