Skip to content

Commit 482ea41

Browse files
committed
libmsi: guard calls of parent class constructed method
RHEL6's glib 2.22 leaves a NULL pointer there.
1 parent 8960c77 commit 482ea41

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

libmsi/libmsi-database.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ libmsi_database_init (LibmsiDatabase *self)
101101
static void
102102
libmsi_database_constructed (GObject *object)
103103
{
104-
G_OBJECT_CLASS (libmsi_database_parent_class)->constructed (object);
104+
if (G_OBJECT_CLASS (libmsi_database_parent_class)->constructed)
105+
G_OBJECT_CLASS (libmsi_database_parent_class)->constructed (object);
105106
}
106107

107108
static void

libmsi/libmsi-query.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ libmsi_query_get_property (GObject *object, guint prop_id, GValue *value, GParam
107107
static void
108108
libmsi_query_constructed (GObject *object)
109109
{
110-
G_OBJECT_CLASS (libmsi_query_parent_class)->constructed (object);
110+
if (G_OBJECT_CLASS (libmsi_query_parent_class)->constructed)
111+
G_OBJECT_CLASS (libmsi_query_parent_class)->constructed (object);
111112
}
112113

113114
static void

libmsi/libmsi-record.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ libmsi_record_constructed (GObject *object)
122122
// FIXME: +1 could be removed if accessing with idx-1
123123
self->fields = g_new0 (LibmsiField, self->count + 1);
124124

125-
G_OBJECT_CLASS (libmsi_record_parent_class)->constructed (object);
125+
if (G_OBJECT_CLASS (libmsi_record_parent_class)->constructed)
126+
G_OBJECT_CLASS (libmsi_record_parent_class)->constructed (object);
126127
}
127128

128129
static void

libmsi/libmsi-summary-info.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ libmsi_summary_info_constructed (GObject *object)
128128
}
129129
}
130130

131-
G_OBJECT_CLASS (libmsi_summary_info_parent_class)->constructed (object);
131+
if (G_OBJECT_CLASS (libmsi_summary_info_parent_class)->constructed)
132+
G_OBJECT_CLASS (libmsi_summary_info_parent_class)->constructed (object);
132133
}
133134

134135
static void

0 commit comments

Comments
 (0)