36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 5419228f632af830d9117c142a1c7c1a9708cc08 Mon Sep 17 00:00:00 2001
|
|
From: Egor Bychin <e.bychin@drweb.com>
|
|
Date: Mon, 11 Oct 2021 14:26:20 +0300
|
|
Subject: [PATCH] gtype: Fix pointer being dereferenced despite NULL check
|
|
|
|
Conflict:NA
|
|
Reference:https://gitlab.gnome.org/GNOME/glib/-/commit/5419228f632af830d9117c142a1c7c1a9708cc08
|
|
|
|
---
|
|
gobject/gtype.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/gobject/gtype.c b/gobject/gtype.c
|
|
index 34f62ecba5..26ec30b7b7 100644
|
|
--- a/gobject/gtype.c
|
|
+++ b/gobject/gtype.c
|
|
@@ -3159,11 +3159,14 @@ g_type_class_peek_parent (gpointer g_class)
|
|
g_return_val_if_fail (g_class != NULL, NULL);
|
|
|
|
node = lookup_type_node_I (G_TYPE_FROM_CLASS (g_class));
|
|
+
|
|
+ g_return_val_if_fail (node != NULL, NULL);
|
|
+
|
|
/* We used to acquire a read lock here. That is not necessary, since
|
|
* parent->data->class.class is constant as long as the derived class
|
|
* exists.
|
|
*/
|
|
- if (node && node->is_classed && node->data && NODE_PARENT_TYPE (node))
|
|
+ if (node->is_classed && node->data && NODE_PARENT_TYPE (node))
|
|
{
|
|
node = lookup_type_node_I (NODE_PARENT_TYPE (node));
|
|
class = node->data->class.class;
|
|
--
|
|
GitLab
|
|
|