luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 07:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

gobject: Add a missing NULL check for the return from lookup_type_node_I()

Browse Source 
This can cause a `NULL` dereference on the next line if there is no
`TypeNode` for `iface_type`, for example if `iface_type ==
G_TYPE_INVALID`.

Unlikely, but possible since this API is public.

Spotted by Coverity.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Coverity CID: #1501602
This commit is contained in:
Philip Withnall
2022-12-21 19:16:10 +00:00
parent 5e378c775a
commit 251bab3e71
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gobject/gtype.c
View File

@@ -4161,7 +4161,7 @@ g_type_check_instance_is_a (GTypeInstance *type_instance,
return FALSE; return FALSE;
iface = lookup_type_node_I (iface_type); iface = lookup_type_node_I (iface_type);
if (iface->is_final) if (iface && iface->is_final)
return type_instance->g_class->g_type == iface_type; return type_instance->g_class->g_type == iface_type;
node = lookup_type_node_I (type_instance->g_class->g_type); node = lookup_type_node_I (type_instance->g_class->g_type);

4
gobject/tests/type-flags.c
View File

@@ -130,6 +130,8 @@ test_type_flags_final_instance_check (void)
TEST_TYPE_DEPRECATED)); TEST_TYPE_DEPRECATED));
g_assert_true (g_type_check_instance_is_a ((GTypeInstance *) final, g_assert_true (g_type_check_instance_is_a ((GTypeInstance *) final,
G_TYPE_OBJECT)); G_TYPE_OBJECT));
g_assert_false (g_type_check_instance_is_a ((GTypeInstance *) final,
G_TYPE_INVALID));
g_clear_object (&final); g_clear_object (&final);
} }
@@ -184,6 +186,8 @@ test_type_flags_deprecated (void)
G_TYPE_OBJECT)); G_TYPE_OBJECT));
g_assert_false (g_type_check_instance_is_a ((GTypeInstance *) deprecated_object, g_assert_false (g_type_check_instance_is_a ((GTypeInstance *) deprecated_object,
TEST_TYPE_FINAL)); TEST_TYPE_FINAL));
g_assert_false (g_type_check_instance_is_a ((GTypeInstance *) deprecated_object,
G_TYPE_INVALID));
g_test_assert_expected_messages (); g_test_assert_expected_messages ();