Do not allow assignment with incompatible pointers

That patch makes type check with pointer more strict.

Fixes bug 574486.

diff --git a/vala/valapointertype.vala b/vala/valapointertype.vala
index 76922dcc9b6b9e57f8fd0292859c588e121c7aa3..d3203f461788ebc3cce71fa6770686faf362206f 100644 (file)
--- a/vala/valapointertype.vala
+++ b/vala/valapointertype.vala
@@ -62,7 +62,22 @@ public class Vala.PointerType : DataType {
        }
 
        public override bool compatible (DataType target_type) {
-               if (target_type is PointerType || (target_type.data_type != null && target_type.data_type.get_attribute ("PointerType") != null)) {
+               if (target_type is PointerType) {
+                       var tt = target_type as PointerType;
+
+                       if (tt.base_type is VoidType || base_type is VoidType) {
+                               return true;
+                       }
+
+                       /* dereference only if both types are references or not */
+                       if (base_type.is_reference_type_or_type_parameter () != tt.base_type.is_reference_type_or_type_parameter ()) {
+                               return false;
+                       }
+
+                       return base_type.compatible (tt.base_type);
+               }
+
+               if ((target_type.data_type != null && target_type.data_type.get_attribute ("PointerType") != null)) {
                        return true;
                }
 

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index f4e1b61a06ba06f195aa836e37d13a045867aaff..b877a4a0e6ea2a1fd73d3ca00f2b4f8cd268cc45 100644 (file)
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -1007,7 +1007,7 @@ public class string {
 
                string* result = GLib.malloc0 (this.size () - ((char*) end_string - (char*) start_string) + str_size + 1);
 
-               char* dest = result;
+               char* dest = (char*) result;
 
                GLib.Memory.copy (dest, this, (char*) start_string - (char*) this);
                dest += (char*) start_string - (char*) this;