luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gsignal: Properly handle NULL nodes

Browse Source
This commit is contained in:
Colin Walters 2012-06-21 12:12:53 -04:00
parent ccd30d6816
commit 56411bb678
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gobject/gsignal.c
View File

@ -1017,12 +1017,16 @@ g_signal_remove_emission_hook (guint signal_id,
SIGNAL_LOCK (); SIGNAL_LOCK ();
node = LOOKUP_SIGNAL_NODE (signal_id); node = LOOKUP_SIGNAL_NODE (signal_id);
if (!node || node->destroyed) if (!node || node->destroyed)
{
g_warning ("%s: invalid signal id `%u'", G_STRLOC, signal_id); g_warning ("%s: invalid signal id `%u'", G_STRLOC, signal_id);
goto out;
}
else if (!node->emission_hooks || !g_hook_destroy (node->emission_hooks, hook_id)) else if (!node->emission_hooks || !g_hook_destroy (node->emission_hooks, hook_id))
g_warning ("%s: signal \"%s\" had no hook (%lu) to remove", G_STRLOC, node->name, hook_id); g_warning ("%s: signal \"%s\" had no hook (%lu) to remove", G_STRLOC, node->name, hook_id);
node->single_va_closure_is_valid = FALSE; node->single_va_closure_is_valid = FALSE;
out:
SIGNAL_UNLOCK (); SIGNAL_UNLOCK ();
} }
@ -1775,9 +1779,9 @@ g_signal_set_va_marshaller (guint signal_id,
if (cc->closure->marshal == node->c_marshaller) if (cc->closure->marshal == node->c_marshaller)
_g_closure_set_va_marshal (cc->closure, va_marshaller); _g_closure_set_va_marshal (cc->closure, va_marshaller);
} }
}
node->single_va_closure_is_valid = FALSE; node->single_va_closure_is_valid = FALSE;
}
SIGNAL_UNLOCK (); SIGNAL_UNLOCK ();
} }