From 16711505217534f4c29d726c5a6f5f563e86c81a Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 10 Apr 2026 12:28:34 -0700 Subject: [PATCH] [wpiutil] WPI_WaitForObjectTimeout: Add null check (#8739) --- wpiutil/src/main/native/cpp/Synchronization.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wpiutil/src/main/native/cpp/Synchronization.cpp b/wpiutil/src/main/native/cpp/Synchronization.cpp index 1f55e4ba2e..277299dde3 100644 --- a/wpiutil/src/main/native/cpp/Synchronization.cpp +++ b/wpiutil/src/main/native/cpp/Synchronization.cpp @@ -443,7 +443,9 @@ int WPI_WaitForObjectTimeout(WPI_Handle handle, double timeout, int* timed_out) { bool timedOutBool; int rv = wpi::util::WaitForObject(handle, timeout, &timedOutBool); - *timed_out = timedOutBool ? 1 : 0; + if (timed_out) { + *timed_out = timedOutBool ? 1 : 0; + } return rv; } @@ -461,7 +463,9 @@ int WPI_WaitForObjectsTimeout(const WPI_Handle* handles, int handles_count, auto signaledResult = wpi::util::WaitForObjects( std::span(handles, handles_count), std::span(signaled, handles_count), timeout, &timedOutBool); - *timed_out = timedOutBool ? 1 : 0; + if (timed_out) { + *timed_out = timedOutBool ? 1 : 0; + } return signaledResult.size(); }