]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
dbus-connection: Avoid computing a negative timeout
authorGleb Popov <6yearold@gmail.com>
Sat, 3 May 2025 14:10:23 +0000 (17:10 +0300)
committerSimon McVittie <smcv@collabora.com>
Fri, 16 May 2025 10:26:23 +0000 (10:26 +0000)
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

dbus/dbus-connection.c

index 53ca34a8be032e903526f269bc707673589782d0..d6894e9a660c0a326b0e0fa2c762795fd12460fe 100644 (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;