codegen: Use NULL as default C value for nullable structs

Fixes bug 665904.

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index f5ca0c0bb05318bb5b9a6e84328ea4c511409d98..8df596643f7c9cc8583052d953d8057a912fc90f 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -5448,7 +5448,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
        public CCodeExpression? default_value_for_type (DataType type, bool initializer_expression) {
                var st = type.data_type as Struct;
                var array_type = type as ArrayType;
-               if (type.data_type != null && get_ccode_default_value (type.data_type) != "") {
+               if (type.data_type != null && !type.nullable && get_ccode_default_value (type.data_type) != "") {
                        return new CCodeConstant (get_ccode_default_value (type.data_type));
                } else if (initializer_expression && !type.nullable &&
                                   (st != null || (array_type != null && array_type.fixed_length))) {