fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-03 21:50:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-connection-timeout' into 'main'

Browse source 
dbus-connection: Avoid computing a negative timeout

See merge request dbus/dbus!524
This commit is contained in:
Simon McVittie 2025-05-16 10:26:34 +00:00
commit aa53ceb2b9
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dbus/dbus-connection.c
View file

@ -2510,7 +2510,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
*/
_dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
_dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
_dbus_memory_pause_based_on_timeout (-1);
}
else
{
@ -2519,7 +2519,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
pending,
DBUS_ITERATION_DO_READING |
DBUS_ITERATION_BLOCK,
timeout_milliseconds - elapsed_milliseconds);
-1);
}
goto recheck_status;

2
dbus/dbus-sysdeps-pthread.c
View file

@ -229,6 +229,8 @@ _dbus_platform_condvar_wait_timeout (DBusCondVar *cond,
struct timespec end_time;
int result;
_dbus_assert (timeout_milliseconds >= 0);
#ifdef HAVE_MONOTONIC_CLOCK
if (have_monotonic_clock)
{