i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: Check != not < B_INFINITE_TIMEOUT.

Browse Source 
As it's INT64_MAX, so anything "larger" is really overflowed into negative.
This commit is contained in:
Augustin Cavalier
2024-08-07 14:49:48 -04:00
parent 4d2ab928c6
commit bd05c92198
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/syscall_restart.h
+1 -1
View File
@@ -51,7 +51,7 @@ syscall_restart_handle_timeout_pre(uint32& flags, bigtime_t& timeout)
if (timeout > 0 && (flags & B_RELATIVE_TIMEOUT) != 0) if (timeout > 0 && (flags & B_RELATIVE_TIMEOUT) != 0)
flags = (flags & ~B_RELATIVE_TIMEOUT) | B_ABSOLUTE_TIMEOUT; flags = (flags & ~B_RELATIVE_TIMEOUT) | B_ABSOLUTE_TIMEOUT;
} else if ((flags & B_RELATIVE_TIMEOUT) != 0) { } else if ((flags & B_RELATIVE_TIMEOUT) != 0) {
if (timeout > 0 && timeout < B_INFINITE_TIMEOUT) { if (timeout > 0 && timeout != B_INFINITE_TIMEOUT) {
timeout += system_time(); timeout += system_time();
// deal with overflow // deal with overflow
if (timeout < 0) if (timeout < 0)
src/system/kernel/thread.cpp
+1 -1
View File
@@ -2963,7 +2963,7 @@ thread_block_with_timeout(uint32 timeoutFlags, bigtime_t timeout)
return thread->wait.status; return thread->wait.status;
bool useTimer = (timeoutFlags & (B_RELATIVE_TIMEOUT | B_ABSOLUTE_TIMEOUT)) != 0 bool useTimer = (timeoutFlags & (B_RELATIVE_TIMEOUT | B_ABSOLUTE_TIMEOUT)) != 0
&& timeout < B_INFINITE_TIMEOUT; && timeout != B_INFINITE_TIMEOUT;
if (useTimer) { if (useTimer) {
// Timer flags: absolute/relative. // Timer flags: absolute/relative.