codegen: Check param for null before using it

Regression of 5490b0b21a4089d803d51c91311430d60d266f7b

This caused criticals like:

  vala_get_ccode_array_length: assertion 'node != NULL' failed

See https://gitlab.gnome.org/GNOME/vala/issues/929

diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index 9ffb8deb7575594b77a672ad07feb946bb6660e6..7a6d159b204eaca3cdbdf99c06db8d1c0a37c17f 100644 (file)
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -902,7 +902,7 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
 
                        // update possible stale _*_size_ variable
                        if (unary != null && unary.operator == UnaryOperator.REF) {
-                               if (get_ccode_array_length (param) && param.variable_type is ArrayType
+                               if (param != null && get_ccode_array_length (param) && param.variable_type is ArrayType
                                    && !((ArrayType) param.variable_type).fixed_length && ((ArrayType) param.variable_type).rank == 1) {
                                        unowned Symbol? array_var = unary.inner.symbol_reference;
                                        unowned LocalVariable? array_local = array_var as LocalVariable;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a5dc4b037a0d9beb4298696b92dcbc36bc7a7c1f..4f5fd64dcb894eca7eb67895848b1543cd008f56 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -198,6 +198,7 @@ TESTS = \
        methods/varargs-delegate-without-target.vala \
        methods/varargs-gvalue.vala \
        methods/varargs-out.vala \
+       methods/varargs-ref.vala \
        methods/varargs-struct.vala \
        control-flow/assigned-local-variable.vala \
        control-flow/break.vala \

diff --git a/tests/methods/varargs-ref.vala b/tests/methods/varargs-ref.vala
new file mode 100644 (file)
index 0000000..9c3f5fa
--- /dev/null
+++ b/tests/methods/varargs-ref.vala
@@ -0,0 +1,14 @@
+void set_foo_varg (string s, ...) {
+       var args = va_list ();
+       string** ref_s1 = args.arg ();
+       *ref_s1 = "bar";
+       string** ref_s2 = args.arg ();
+       *ref_s2 = "manam";
+}
+
+void main () {
+       unowned string bar = "", manam = "";
+       set_foo_varg ("foo", ref bar, ref manam);
+       assert (bar == "bar");
+       assert (manam == "manam");
+}