diff options
author | JinWang An <jinwang.an@samsung.com> | 2024-04-04 05:50:44 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@review> | 2024-04-04 05:50:44 +0000 |
commit | 75484cdb96a93a146ee7690688fd39abe38d89f5 (patch) | |
tree | 873c5abc86180d2fac94b73e8345e465a15a68a9 | |
parent | 073339230bc0c4b42387f786c6b0d7aaca3f1a81 (diff) | |
parent | c291875b4df29004262e45736b2b6bc581838ea9 (diff) | |
download | glib-tizen.tar.gz glib-tizen.tar.bz2 glib-tizen.zip |
Merge "Fix crashes in various GParamSpec creation functions" into tizenHEADaccepted/tizen/unified/x/20240409.070654accepted/tizen/unified/20240408.160530tizenaccepted/tizen_unified_xaccepted/tizen_unified
-rw-r--r-- | gobject/gparamspecs.c | 48 |
1 files changed, 47 insertions, 1 deletions
diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c index 17b860657..f4a39f1ab 100644 --- a/gobject/gparamspecs.c +++ b/gobject/gparamspecs.c @@ -1884,6 +1884,8 @@ g_param_spec_char (const gchar *name, nick, blurb, flags); + if (cspec == NULL) + return NULL; cspec->minimum = minimum; cspec->maximum = maximum; @@ -1924,6 +1926,8 @@ g_param_spec_uchar (const gchar *name, nick, blurb, flags); + if (uspec == NULL) + return NULL; uspec->minimum = minimum; uspec->maximum = maximum; @@ -1966,6 +1970,8 @@ g_param_spec_boolean (const gchar *name, nick, blurb, flags); + if (bspec == NULL) + return NULL; bspec->default_value = default_value; @@ -2006,6 +2012,8 @@ g_param_spec_int (const gchar *name, nick, blurb, flags); + if (ispec == NULL) + return NULL; ispec->minimum = minimum; ispec->maximum = maximum; @@ -2048,6 +2056,8 @@ g_param_spec_uint (const gchar *name, nick, blurb, flags); + if (uspec == NULL) + return NULL; uspec->minimum = minimum; uspec->maximum = maximum; @@ -2090,6 +2100,8 @@ g_param_spec_long (const gchar *name, nick, blurb, flags); + if (lspec == NULL) + return NULL; lspec->minimum = minimum; lspec->maximum = maximum; @@ -2133,6 +2145,8 @@ g_param_spec_ulong (const gchar *name, nick, blurb, flags); + if (uspec == NULL) + return NULL; uspec->minimum = minimum; uspec->maximum = maximum; @@ -2175,6 +2189,8 @@ g_param_spec_int64 (const gchar *name, nick, blurb, flags); + if (lspec == NULL) + return NULL; lspec->minimum = minimum; lspec->maximum = maximum; @@ -2218,6 +2234,8 @@ g_param_spec_uint64 (const gchar *name, nick, blurb, flags); + if (uspec == NULL) + return NULL; uspec->minimum = minimum; uspec->maximum = maximum; @@ -2256,6 +2274,8 @@ g_param_spec_unichar (const gchar *name, nick, blurb, flags); + if (uspec == NULL) + return NULL; uspec->default_value = default_value; @@ -2300,7 +2320,9 @@ g_param_spec_enum (const gchar *name, nick, blurb, flags); - + if (espec == NULL) + return NULL; + espec->enum_class = enum_class; espec->default_value = default_value; G_PARAM_SPEC (espec)->value_type = enum_type; @@ -2346,6 +2368,8 @@ g_param_spec_flags (const gchar *name, nick, blurb, flags); + if (fspec == NULL) + return NULL; fspec->flags_class = flags_class; fspec->default_value = default_value; @@ -2388,6 +2412,8 @@ g_param_spec_float (const gchar *name, nick, blurb, flags); + if (fspec == NULL) + return NULL; fspec->minimum = minimum; fspec->maximum = maximum; @@ -2431,6 +2457,8 @@ g_param_spec_double (const gchar *name, nick, blurb, flags); + if (dspec == NULL) + return NULL; dspec->minimum = minimum; dspec->maximum = maximum; @@ -2465,6 +2493,8 @@ g_param_spec_string (const gchar *name, nick, blurb, flags); + if (sspec == NULL) + return NULL; g_free (sspec->default_value); sspec->default_value = g_strdup (default_value); @@ -2503,6 +2533,8 @@ g_param_spec_param (const gchar *name, nick, blurb, flags); + if (pspec == NULL) + return NULL; G_PARAM_SPEC (pspec)->value_type = param_type; @@ -2541,6 +2573,8 @@ g_param_spec_boxed (const gchar *name, nick, blurb, flags); + if (bspec == NULL) + return NULL; G_PARAM_SPEC (bspec)->value_type = boxed_type; @@ -2575,6 +2609,8 @@ g_param_spec_pointer (const gchar *name, nick, blurb, flags); + if (pspec == NULL) + return NULL; return G_PARAM_SPEC (pspec); } @@ -2611,6 +2647,8 @@ g_param_spec_gtype (const gchar *name, nick, blurb, flags); + if (tspec == NULL) + return NULL; tspec->is_a_type = is_a_type; @@ -2651,6 +2689,8 @@ g_param_spec_value_array (const gchar *name, nick, blurb, flags); + if (aspec == NULL) + return NULL; if (element_spec) { @@ -2692,6 +2732,8 @@ g_param_spec_object (const gchar *name, nick, blurb, flags); + if (ospec == NULL) + return NULL; G_PARAM_SPEC (ospec)->value_type = object_type; @@ -2734,6 +2776,8 @@ g_param_spec_override (const gchar *name, pspec = g_param_spec_internal (G_TYPE_PARAM_OVERRIDE, name, NULL, NULL, overridden->flags); + if (pspec == NULL) + return NULL; pspec->value_type = G_PARAM_SPEC_VALUE_TYPE (overridden); G_PARAM_SPEC_OVERRIDE (pspec)->overridden = g_param_spec_ref (overridden); @@ -2781,6 +2825,8 @@ g_param_spec_variant (const gchar *name, nick, blurb, flags); + if (vspec == NULL) + return NULL; vspec->type = g_variant_type_copy (type); if (default_value) |