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

Merge branch '1459-async-queue-precondition' into 'master'

Browse Source 
Resolve "Missing g_return_val_if_fail in g_async_queue_timeout_pop"

Closes #1459

See merge request GNOME/glib!201
This commit is contained in:
Philip Withnall 2018-07-30 17:03:54 +00:00
commit b5b0485bfe
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gasyncqueue.c
View File

@ -539,6 +539,8 @@ g_async_queue_timeout_pop (GAsyncQueue *queue,
gint64 end_time = g_get_monotonic_time () + timeout;
gpointer retval;
g_return_val_if_fail (queue != NULL, NULL);
g_mutex_lock (&queue->mutex);
retval = g_async_queue_pop_intern_unlocked (queue, TRUE, end_time);
g_mutex_unlock (&queue->mutex);
@ -567,6 +569,8 @@ g_async_queue_timeout_pop_unlocked (GAsyncQueue *queue,
{
gint64 end_time = g_get_monotonic_time () + timeout;
g_return_val_if_fail (queue != NULL, NULL);
return g_async_queue_pop_intern_unlocked (queue, TRUE, end_time);
}