From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 2 Jan 2019 08:33:26 +0000 (+0100)
Subject: glib-2.0: Use correct array-length-type for returned arrays
X-Git-Tag: 0.36.18~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b6c4c26069b4758383fb4ab4fb3a134507aef6c;p=thirdparty%2Fvala.git

glib-2.0: Use correct array-length-type for returned arrays

As usual length is returned by an implicit out-parameter where the
provided target variable must have a matching data type.

Discovered by -fstack-protector-all

See https://gitlab.gnome.org/GNOME/gitg/issues/171
---

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 2d3bf2b60..fbf9c26fd 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -4221,6 +4221,7 @@ namespace GLib {
 		public bool has_group (string uri, string group) throws BookmarkFileError;
 		public bool has_application (string uri, string name) throws BookmarkFileError;
 		public int get_size ();
+		[CCode (array_length_type = "gsize")]
 		public string[] get_uris ();
 		public string get_title (string uri) throws BookmarkFileError;
 		public string get_description (string uri) throws BookmarkFileError;
@@ -4230,7 +4231,9 @@ namespace GLib {
 		public time_t get_added (string uri) throws BookmarkFileError;
 		public time_t get_modified (string uri) throws BookmarkFileError;
 		public time_t get_visited (string uri) throws BookmarkFileError;
+		[CCode (array_length_type = "gsize")]
 		public string[] get_groups (string uri) throws BookmarkFileError;
+		[CCode (array_length_type = "gsize")]
 		public string[] get_applications (string uri) throws BookmarkFileError;
 		public bool get_app_info (string uri, string name, out string exec, out uint count, out time_t stamp) throws BookmarkFileError;
 		public void set_title (string uri, string title);
@@ -4731,6 +4734,7 @@ namespace GLib {
 		[Version (since = "2.14")]
 		public List<unowned K> get_keys ();
 #if VALA_0_26
+		[CCode (array_length_type = "guint")]
 		[Version (since = "2.40")]
 		public (unowned K)[] get_keys_as_array ();
 #endif
@@ -5006,6 +5010,7 @@ namespace GLib {
 		public size_t get_size ();
 		public uint hash ();
 		public int compare (GLib.Bytes bytes2);
+		[CCode (array_length_type = "gsize")]
 		public static uint8[] unref_to_data (owned GLib.Bytes bytes);
 		public static GLib.ByteArray unref_to_array (owned GLib.Bytes bytes);