vala: NullLiteral is not a valid argument for string concatenation

Fixes https://gitlab.gnome.org/GNOME/vala/issues/1260

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4b9aaa2a457b901d2e7c78acc1f7ef2083834bdb..740ea5490c1aaacacfc5a5854465876ee1244761 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -49,6 +49,7 @@ TESTS = \
        basic-types/custom-types.vala \
        basic-types/default-gtype.vala \
        basic-types/strings.vala \
+       basic-types/string-concat-null.test \
        basic-types/arrays.vala \
        basic-types/arrays-generics.vala \
        basic-types/arrays-fixed-assignment.vala \

diff --git a/tests/basic-types/string-concat-null.test b/tests/basic-types/string-concat-null.test
new file mode 100644 (file)
index 0000000..f12632d
--- /dev/null
+++ b/tests/basic-types/string-concat-null.test
@@ -0,0 +1,5 @@
+Invalid Code
+
+void main () {
+       var str = "foo" + null + "bar";
+}

diff --git a/tests/basic-types/strings.vala b/tests/basic-types/strings.vala
index 1aafdc6b638818c2f4ceef275e13574340bfb2a3..99136bee1f81205262d64e247d9cbe0950e7d320 100644 (file)
--- a/tests/basic-types/strings.vala
+++ b/tests/basic-types/strings.vala
@@ -35,6 +35,11 @@ void test_string () {
        assert (t[1] == 'l');
 }
 
+void test_string_concat () {
+       var s = "hello" + "world";
+       assert (s == "helloworld");
+}
+
 void test_string_joinv () {
        string[] sa = { "hello", "my", "world" };
 
@@ -121,6 +126,7 @@ void test_string_substring () {
 
 void main () {
        test_string ();
+       test_string_concat ();
        test_string_joinv ();
        test_string_replace ();
        test_string_slice ();

diff --git a/vala/valabinaryexpression.vala b/vala/valabinaryexpression.vala
index 20ad71d05478eedf01c049206e8ef7439bee651c..3f1737d7fd4bbfa1dcf90fa1562909382c2357d4 100644 (file)
--- a/vala/valabinaryexpression.vala
+++ b/vala/valabinaryexpression.vala
@@ -359,7 +359,9 @@ public class Vala.BinaryExpression : Expression {
                    && left.value_type.compatible (context.analyzer.string_type)) {
                        // string concatenation
 
-                       if (right.value_type == null || !right.value_type.compatible (context.analyzer.string_type)) {
+                       if (right.value_type == null || !right.value_type.compatible (context.analyzer.string_type)
+                           || left is NullLiteral || right is NullLiteral) {
+                               // operands cannot be null
                                error = true;
                                Report.error (source_reference, "Operands must be strings");
                                return false;