From: Gleb Popov <6yearold@gmail.com>
Date: Sat, 3 May 2025 14:10:23 +0000 (+0300)
Subject: dbus-connection: Avoid computing a negative timeout
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fdb6746d855fed34dfc88bafb353fa3c4ed8d905;p=thirdparty%2Fdbus.git

dbus-connection: Avoid computing a negative timeout

Getting into the `if (timeout == NULL)` block means that
timeout_milliseconds == -1, so it doesn't make sense to do arithmetic on it.

Pass -1 instead of a nonsensical value in this case
---

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 53ca34a8b..d6894e9a6 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -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;