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

Revert "gcancellable: Mark assert-only variable as unused"

Browse Source 
This reverts commit 6c679fb37a0bfeed7beb42d1b1e3590713eac10c.

Merge request !2765 has caused a thread safety regression in
`GCancellableSource` disposal. It landed too late in the cycle to fix
with any confidence before the 2.82 release, so the changes are being
reverted for the `glib-2-82` branch and 2.82.0 release.

This commit is not problematic, but is built entirely on top of the
problematic MR, so has to be reverted.

Fixes: #3448
Re-opens: #774, #2309, #2313
This commit is contained in:
Philip Withnall 2024-08-25 17:39:04 +01:00
parent 282545565a
commit 266e892a5e
No known key found for this signature in database
GPG Key ID: DCDF5885B1F3ED73
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gcancellable.c
View File

@ -664,7 +664,7 @@ cancellable_source_cancelled (GCancellable *cancellable,
{
GSource *source = user_data;
GCancellableSource *cancellable_source = (GCancellableSource *) source;
gboolean callback_was_not_called G_GNUC_UNUSED;
gboolean callback_was_not_called;
g_source_ref (source);
g_source_set_ready_time (source, 0);