luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-21 14:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'add-null-check-codegen' into 'main'

Browse Source 
codegen: Check parameter before calling its interface method

See merge request GNOME/glib!3175
This commit is contained in:
Philip Withnall 2022-12-30 13:44:20 +00:00
commit 2d5d990c6a
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gio/gdbus-2.0/codegen/codegen.py
View File

@ -2364,8 +2364,17 @@ class CodeGenerator:
"{\n" % (p.arg.ctype_in, i.name_lower, p.name_lower, i.camel_name) "{\n" % (p.arg.ctype_in, i.name_lower, p.name_lower, i.camel_name)
) )
self.outfile.write( self.outfile.write(
" g_return_val_if_fail (%sIS_%s (object), %s);\n"
"\n"
" return %s%s_GET_IFACE (object)->get_%s (object);\n" " return %s%s_GET_IFACE (object)->get_%s (object);\n"
% (i.ns_upper, i.name_upper, p.name_lower) % (
i.ns_upper,
i.name_upper,
p.arg.ctype_in_default_value,
i.ns_upper,
i.name_upper,
p.name_lower,
)
) )
self.outfile.write("}\n") self.outfile.write("}\n")
self.outfile.write("\n") self.outfile.write("\n")
@ -3100,9 +3109,6 @@ class CodeGenerator:
# property vfuncs # property vfuncs
for p in i.properties: for p in i.properties:
nul_value = "0"
if p.arg.free_func is not None:
nul_value = "NULL"
self.outfile.write( self.outfile.write(
"static %s\n" "static %s\n"
"%s_proxy_get_%s (%s *object)\n" "%s_proxy_get_%s (%s *object)\n"
@ -3119,7 +3125,7 @@ class CodeGenerator:
i.ns_upper, i.ns_upper,
i.name_upper, i.name_upper,
p.arg.ctype_in, p.arg.ctype_in,
nul_value, p.arg.ctype_in_default_value,
) )
) )
# For some property types, we have to free the returned # For some property types, we have to free the returned

17
gio/gdbus-2.0/codegen/dbustypes.py
View File

@ -76,6 +76,7 @@ class Arg:
self.ctype_in_g = "GVariant *" self.ctype_in_g = "GVariant *"
self.ctype_in = "GVariant *" self.ctype_in = "GVariant *"
self.ctype_in_dup = "GVariant *" self.ctype_in_dup = "GVariant *"
self.ctype_in_default_value = "NULL"
self.ctype_out = "GVariant **" self.ctype_out = "GVariant **"
self.gtype = "G_TYPE_VARIANT" self.gtype = "G_TYPE_VARIANT"
self.free_func = "g_variant_unref" self.free_func = "g_variant_unref"
@ -91,6 +92,7 @@ class Arg:
if self.signature == "b": if self.signature == "b":
self.ctype_in_g = "gboolean " self.ctype_in_g = "gboolean "
self.ctype_in = "gboolean " self.ctype_in = "gboolean "
self.ctype_in_default_value = "FALSE"
self.ctype_out = "gboolean *" self.ctype_out = "gboolean *"
self.gtype = "G_TYPE_BOOLEAN" self.gtype = "G_TYPE_BOOLEAN"
self.free_func = None self.free_func = None
@ -101,6 +103,7 @@ class Arg:
elif self.signature == "y": elif self.signature == "y":
self.ctype_in_g = "guchar " self.ctype_in_g = "guchar "
self.ctype_in = "guchar " self.ctype_in = "guchar "
self.ctype_in_default_value = "'\\0'"
self.ctype_out = "guchar *" self.ctype_out = "guchar *"
self.gtype = "G_TYPE_UCHAR" self.gtype = "G_TYPE_UCHAR"
self.free_func = None self.free_func = None
@ -111,6 +114,7 @@ class Arg:
elif self.signature == "n": elif self.signature == "n":
self.ctype_in_g = "gint " self.ctype_in_g = "gint "
self.ctype_in = "gint16 " self.ctype_in = "gint16 "
self.ctype_in_default_value = "0"
self.ctype_out = "gint16 *" self.ctype_out = "gint16 *"
self.gtype = "G_TYPE_INT" self.gtype = "G_TYPE_INT"
self.free_func = None self.free_func = None
@ -121,6 +125,7 @@ class Arg:
elif self.signature == "q": elif self.signature == "q":
self.ctype_in_g = "guint " self.ctype_in_g = "guint "
self.ctype_in = "guint16 " self.ctype_in = "guint16 "
self.ctype_in_default_value = "0"
self.ctype_out = "guint16 *" self.ctype_out = "guint16 *"
self.gtype = "G_TYPE_UINT" self.gtype = "G_TYPE_UINT"
self.free_func = None self.free_func = None
@ -131,6 +136,7 @@ class Arg:
elif self.signature == "i": elif self.signature == "i":
self.ctype_in_g = "gint " self.ctype_in_g = "gint "
self.ctype_in = "gint " self.ctype_in = "gint "
self.ctype_in_default_value = "0"
self.ctype_out = "gint *" self.ctype_out = "gint *"
self.gtype = "G_TYPE_INT" self.gtype = "G_TYPE_INT"
self.free_func = None self.free_func = None
@ -141,6 +147,7 @@ class Arg:
elif self.signature == "u": elif self.signature == "u":
self.ctype_in_g = "guint " self.ctype_in_g = "guint "
self.ctype_in = "guint " self.ctype_in = "guint "
self.ctype_in_default_value = "0"
self.ctype_out = "guint *" self.ctype_out = "guint *"
self.gtype = "G_TYPE_UINT" self.gtype = "G_TYPE_UINT"
self.free_func = None self.free_func = None
@ -151,6 +158,7 @@ class Arg:
elif self.signature == "x": elif self.signature == "x":
self.ctype_in_g = "gint64 " self.ctype_in_g = "gint64 "
self.ctype_in = "gint64 " self.ctype_in = "gint64 "
self.ctype_in_default_value = "0"
self.ctype_out = "gint64 *" self.ctype_out = "gint64 *"
self.gtype = "G_TYPE_INT64" self.gtype = "G_TYPE_INT64"
self.free_func = None self.free_func = None
@ -162,6 +170,7 @@ class Arg:
self.ctype_in_g = "guint64 " self.ctype_in_g = "guint64 "
self.ctype_in = "guint64 " self.ctype_in = "guint64 "
self.ctype_out = "guint64 *" self.ctype_out = "guint64 *"
self.ctype_in_default_value = "0"
self.gtype = "G_TYPE_UINT64" self.gtype = "G_TYPE_UINT64"
self.free_func = None self.free_func = None
self.format_in = "t" self.format_in = "t"
@ -171,6 +180,7 @@ class Arg:
elif self.signature == "d": elif self.signature == "d":
self.ctype_in_g = "gdouble " self.ctype_in_g = "gdouble "
self.ctype_in = "gdouble " self.ctype_in = "gdouble "
self.ctype_in_default_value = "0.0"
self.ctype_out = "gdouble *" self.ctype_out = "gdouble *"
self.gtype = "G_TYPE_DOUBLE" self.gtype = "G_TYPE_DOUBLE"
self.free_func = None self.free_func = None
@ -182,6 +192,7 @@ class Arg:
self.ctype_in_g = "const gchar *" self.ctype_in_g = "const gchar *"
self.ctype_in = "const gchar *" self.ctype_in = "const gchar *"
self.ctype_in_dup = "gchar *" self.ctype_in_dup = "gchar *"
self.ctype_in_default_value = "NULL"
self.ctype_out = "gchar **" self.ctype_out = "gchar **"
self.gtype = "G_TYPE_STRING" self.gtype = "G_TYPE_STRING"
self.free_func = "g_free" self.free_func = "g_free"
@ -193,6 +204,7 @@ class Arg:
self.ctype_in_g = "const gchar *" self.ctype_in_g = "const gchar *"
self.ctype_in = "const gchar *" self.ctype_in = "const gchar *"
self.ctype_in_dup = "gchar *" self.ctype_in_dup = "gchar *"
self.ctype_in_default_value = "NULL"
self.ctype_out = "gchar **" self.ctype_out = "gchar **"
self.gtype = "G_TYPE_STRING" self.gtype = "G_TYPE_STRING"
self.free_func = "g_free" self.free_func = "g_free"
@ -204,6 +216,7 @@ class Arg:
self.ctype_in_g = "const gchar *" self.ctype_in_g = "const gchar *"
self.ctype_in = "const gchar *" self.ctype_in = "const gchar *"
self.ctype_in_dup = "gchar *" self.ctype_in_dup = "gchar *"
self.ctype_in_default_value = "NULL"
self.ctype_out = "gchar **" self.ctype_out = "gchar **"
self.gtype = "G_TYPE_STRING" self.gtype = "G_TYPE_STRING"
self.free_func = "g_free" self.free_func = "g_free"
@ -214,6 +227,7 @@ class Arg:
elif self.signature == "ay": elif self.signature == "ay":
self.ctype_in_g = "const gchar *" self.ctype_in_g = "const gchar *"
self.ctype_in = "const gchar *" self.ctype_in = "const gchar *"
self.ctype_in_default_value = "NULL"
self.ctype_in_dup = "gchar *" self.ctype_in_dup = "gchar *"
self.ctype_out = "gchar **" self.ctype_out = "gchar **"
self.gtype = "G_TYPE_STRING" self.gtype = "G_TYPE_STRING"
@ -226,6 +240,7 @@ class Arg:
self.ctype_in_g = "const gchar *const *" self.ctype_in_g = "const gchar *const *"
self.ctype_in = "const gchar *const *" self.ctype_in = "const gchar *const *"
self.ctype_in_dup = "gchar **" self.ctype_in_dup = "gchar **"
self.ctype_in_default_value = "NULL"
self.ctype_out = "gchar ***" self.ctype_out = "gchar ***"
self.gtype = "G_TYPE_STRV" self.gtype = "G_TYPE_STRV"
self.free_func = "g_strfreev" self.free_func = "g_strfreev"
@ -238,6 +253,7 @@ class Arg:
self.ctype_in_g = "const gchar *const *" self.ctype_in_g = "const gchar *const *"
self.ctype_in = "const gchar *const *" self.ctype_in = "const gchar *const *"
self.ctype_in_dup = "gchar **" self.ctype_in_dup = "gchar **"
self.ctype_in_default_value = "NULL"
self.ctype_out = "gchar ***" self.ctype_out = "gchar ***"
self.gtype = "G_TYPE_STRV" self.gtype = "G_TYPE_STRV"
self.free_func = "g_strfreev" self.free_func = "g_strfreev"
@ -250,6 +266,7 @@ class Arg:
self.ctype_in_g = "const gchar *const *" self.ctype_in_g = "const gchar *const *"
self.ctype_in = "const gchar *const *" self.ctype_in = "const gchar *const *"
self.ctype_in_dup = "gchar **" self.ctype_in_dup = "gchar **"
self.ctype_in_default_value = "NULL"
self.ctype_out = "gchar ***" self.ctype_out = "gchar ***"
self.gtype = "G_TYPE_STRV" self.gtype = "G_TYPE_STRV"
self.free_func = "g_strfreev" self.free_func = "g_strfreev"