luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-19 04:01:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lcopyfail' into 'master'

Browse Source 
gobject: Handle runtime checks as such

See merge request GNOME/glib!1505
This commit is contained in:
Philip Withnall 2020-05-20 16:49:17 +00:00
commit 8f291487fe
6 changed files with 40 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gobject/gboxed.c
View File

@ -256,8 +256,7 @@ boxed_proxy_lcopy_value (const GValue *value,
{ {
gpointer *boxed_p = collect_values[0].v_pointer; gpointer *boxed_p = collect_values[0].v_pointer;
if (!boxed_p) g_return_val_if_fail (boxed_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
if (!value->data[0].v_pointer) if (!value->data[0].v_pointer)
*boxed_p = NULL; *boxed_p = NULL;

7
gobject/genums.c
View File

@ -167,10 +167,9 @@ value_flags_enum_lcopy_value (const GValue *value,
guint collect_flags) guint collect_flags)
{ {
gint *int_p = collect_values[0].v_pointer; gint *int_p = collect_values[0].v_pointer;
if (!int_p) g_return_val_if_fail (int_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
*int_p = value->data[0].v_long; *int_p = value->data[0].v_long;
return NULL; return NULL;

5
gobject/gobject.c
View File

@ -4021,9 +4021,8 @@ g_value_object_lcopy_value (const GValue *value,
guint collect_flags) guint collect_flags)
{ {
GObject **object_p = collect_values[0].v_pointer; GObject **object_p = collect_values[0].v_pointer;
if (!object_p) g_return_val_if_fail (object_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
if (!value->data[0].v_pointer) if (!value->data[0].v_pointer)
*object_p = NULL; *object_p = NULL;

3
gobject/gparam.c
View File

@ -871,8 +871,7 @@ value_param_lcopy_value (const GValue *value,
{ {
GParamSpec **param_p = collect_values[0].v_pointer; GParamSpec **param_p = collect_values[0].v_pointer;
if (!param_p) g_return_val_if_fail (param_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
if (!value->data[0].v_pointer) if (!value->data[0].v_pointer)
*param_p = NULL; *param_p = NULL;

18
gobject/gtype.h
View File

@ -1178,17 +1178,13 @@ struct _GInterfaceInfo
* array. To deviate from our string example for a moment, and taking * array. To deviate from our string example for a moment, and taking
* a look at an exemplary implementation for collect_value() of * a look at an exemplary implementation for collect_value() of
* #GObject: * #GObject:
* |[<!-- language="C" --> * |[<!-- language="C" -->
* if (collect_values[0].v_pointer)
* {
* GObject *object = G_OBJECT (collect_values[0].v_pointer); * GObject *object = G_OBJECT (collect_values[0].v_pointer);
* g_return_val_if_fail (object != NULL,
* g_strdup_printf ("Object passed as invalid NULL pointer"));
* // never honour G_VALUE_NOCOPY_CONTENTS for ref-counted types * // never honour G_VALUE_NOCOPY_CONTENTS for ref-counted types
* value->data[0].v_pointer = g_object_ref (object); * value->data[0].v_pointer = g_object_ref (object);
* return NULL; * return NULL;
* }
* else
* return g_strdup_printf ("Object passed as invalid NULL pointer");
* }
* ]| * ]|
* The reference count for valid objects is always incremented, * The reference count for valid objects is always incremented,
* regardless of @collect_flags. For invalid objects, the example * regardless of @collect_flags. For invalid objects, the example
@ -1220,8 +1216,8 @@ struct _GInterfaceInfo
* To complete the string example: * To complete the string example:
* |[<!-- language="C" --> * |[<!-- language="C" -->
* gchar **string_p = collect_values[0].v_pointer; * gchar **string_p = collect_values[0].v_pointer;
* if (!string_p) * g_return_val_if_fail (string_p != NULL,
* return g_strdup_printf ("string location passed as NULL"); * g_strdup_printf ("string location passed as NULL"));
* if (collect_flags & G_VALUE_NOCOPY_CONTENTS) * if (collect_flags & G_VALUE_NOCOPY_CONTENTS)
* *string_p = value->data[0].v_pointer; * *string_p = value->data[0].v_pointer;
* else * else
@ -1231,8 +1227,8 @@ struct _GInterfaceInfo
* reference-counted types: * reference-counted types:
* |[<!-- language="C" --> * |[<!-- language="C" -->
* GObject **object_p = collect_values[0].v_pointer; * GObject **object_p = collect_values[0].v_pointer;
* if (!object_p) * g_return_val_if_fail (object_p != NULL,
* return g_strdup_printf ("object location passed as NULL"); * g_strdup_printf ("object location passed as NULL"));
* if (!value->data[0].v_pointer) * if (!value->data[0].v_pointer)
* *object_p = NULL; * *object_p = NULL;
* else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) // always honour * else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) // always honour

62
gobject/gvaluetypes.c
View File

@ -55,10 +55,9 @@ value_lcopy_char (const GValue *value,
guint collect_flags) guint collect_flags)
{ {
gint8 *int8_p = collect_values[0].v_pointer; gint8 *int8_p = collect_values[0].v_pointer;
if (!int8_p) g_return_val_if_fail (int8_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
*int8_p = value->data[0].v_int; *int8_p = value->data[0].v_int;
return NULL; return NULL;
@ -71,10 +70,9 @@ value_lcopy_boolean (const GValue *value,
guint collect_flags) guint collect_flags)
{ {
gboolean *bool_p = collect_values[0].v_pointer; gboolean *bool_p = collect_values[0].v_pointer;
if (!bool_p) g_return_val_if_fail (bool_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
*bool_p = value->data[0].v_int; *bool_p = value->data[0].v_int;
return NULL; return NULL;
@ -98,10 +96,9 @@ value_lcopy_int (const GValue *value,
guint collect_flags) guint collect_flags)
{ {
gint *int_p = collect_values[0].v_pointer; gint *int_p = collect_values[0].v_pointer;
if (!int_p) g_return_val_if_fail (int_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
*int_p = value->data[0].v_int; *int_p = value->data[0].v_int;
return NULL; return NULL;
@ -125,10 +122,9 @@ value_lcopy_long (const GValue *value,
guint collect_flags) guint collect_flags)
{ {
glong *long_p = collect_values[0].v_pointer; glong *long_p = collect_values[0].v_pointer;
if (!long_p) g_return_val_if_fail (long_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
*long_p = value->data[0].v_long; *long_p = value->data[0].v_long;
return NULL; return NULL;
@ -165,10 +161,9 @@ value_lcopy_int64 (const GValue *value,
guint collect_flags) guint collect_flags)
{ {
gint64 *int64_p = collect_values[0].v_pointer; gint64 *int64_p = collect_values[0].v_pointer;
if (!int64_p) g_return_val_if_fail (int64_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
*int64_p = value->data[0].v_int64; *int64_p = value->data[0].v_int64;
return NULL; return NULL;
@ -205,10 +200,9 @@ value_lcopy_float (const GValue *value,
guint collect_flags) guint collect_flags)
{ {
gfloat *float_p = collect_values[0].v_pointer; gfloat *float_p = collect_values[0].v_pointer;
if (!float_p) g_return_val_if_fail (float_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
*float_p = value->data[0].v_float; *float_p = value->data[0].v_float;
return NULL; return NULL;
@ -245,10 +239,9 @@ value_lcopy_double (const GValue *value,
guint collect_flags) guint collect_flags)
{ {
gdouble *double_p = collect_values[0].v_pointer; gdouble *double_p = collect_values[0].v_pointer;
if (!double_p) g_return_val_if_fail (double_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
*double_p = value->data[0].v_double; *double_p = value->data[0].v_double;
return NULL; return NULL;
@ -309,10 +302,9 @@ value_lcopy_string (const GValue *value,
guint collect_flags) guint collect_flags)
{ {
gchar **string_p = collect_values[0].v_pointer; gchar **string_p = collect_values[0].v_pointer;
if (!string_p) g_return_val_if_fail (string_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
if (!value->data[0].v_pointer) if (!value->data[0].v_pointer)
*string_p = NULL; *string_p = NULL;
else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) else if (collect_flags & G_VALUE_NOCOPY_CONTENTS)
@ -361,8 +353,7 @@ value_lcopy_pointer (const GValue *value,
{ {
gpointer *pointer_p = collect_values[0].v_pointer; gpointer *pointer_p = collect_values[0].v_pointer;
if (!pointer_p) g_return_val_if_fail (pointer_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
*pointer_p = value->data[0].v_pointer; *pointer_p = value->data[0].v_pointer;
@ -414,8 +405,7 @@ value_lcopy_variant (const GValue *value,
{ {
GVariant **variant_p = collect_values[0].v_pointer; GVariant **variant_p = collect_values[0].v_pointer;
if (!variant_p) g_return_val_if_fail (variant_p != NULL, g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value)));
return g_strdup_printf ("value location for '%s' passed as NULL", G_VALUE_TYPE_NAME (value));
if (!value->data[0].v_pointer) if (!value->data[0].v_pointer)
*variant_p = NULL; *variant_p = NULL;