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

Fix redefinition of local variable and non-initialized variable in gobject/gsignal.c

Browse Source
This commit is contained in:
Loic Le Page 2022-01-19 18:55:21 +01:00 committed by Loïc Le Page
parent 84c5675cef
commit 208593acc6
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gobject/gsignal.c
View File

@ -2219,7 +2219,7 @@ g_signal_chain_from_overridden_handler (gpointer instance,
GType chain_type = 0, restore_type = 0; GType chain_type = 0, restore_type = 0;
Emission *emission = NULL; Emission *emission = NULL;
GClosure *closure = NULL; GClosure *closure = NULL;
SignalNode *node; SignalNode *node = NULL;
guint n_params = 0; guint n_params = 0;
g_return_if_fail (G_TYPE_CHECK_INSTANCE (instance)); g_return_if_fail (G_TYPE_CHECK_INSTANCE (instance));
@ -3365,7 +3365,6 @@ g_signal_emit_valist (gpointer instance,
SignalAccumulator *accumulator; SignalAccumulator *accumulator;
Emission emission; Emission emission;
GValue *return_accu, accu = G_VALUE_INIT; GValue *return_accu, accu = G_VALUE_INIT;
guint signal_id;
GType instance_type = G_TYPE_FROM_INSTANCE (instance); GType instance_type = G_TYPE_FROM_INSTANCE (instance);
GValue emission_return = G_VALUE_INIT; GValue emission_return = G_VALUE_INIT;
GType rtype = node->return_type & ~G_SIGNAL_TYPE_STATIC_SCOPE; GType rtype = node->return_type & ~G_SIGNAL_TYPE_STATIC_SCOPE;
@ -3625,14 +3624,14 @@ signal_emit_unlocked_R (SignalNode *node,
if (node->flags & G_SIGNAL_NO_RECURSE) if (node->flags & G_SIGNAL_NO_RECURSE)
{ {
Emission *node = emission_find (signal_id, detail, instance); Emission *emission_node = emission_find (signal_id, detail, instance);
if (node) if (emission_node)
{ {
node->state = EMISSION_RESTART; emission_node->state = EMISSION_RESTART;
SIGNAL_UNLOCK (); SIGNAL_UNLOCK ();
return return_value_altered; return return_value_altered;
} }
} }
accumulator = node->accumulator; accumulator = node->accumulator;
if (accumulator) if (accumulator)