mirror of
https://github.com/microsoft/terminal.git
synced 2025-12-11 04:38:24 -06:00
Defuse throttled_func when it's accidentally engaged (#18235)
This change prevents `throttled_func` from reading uninitialized memory under some yet-unkown circumstances. The tl;dr is: This simply moves the callback invocation into the storage. That way we can centrally avoid invoking the callback accidentally.
This commit is contained in:
parent
09d8ac44ad
commit
adac6085b8
@ -113,7 +113,7 @@ private:
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
std::apply(self->_func, self->_storage.take());
|
self->_storage.apply(self->_func);
|
||||||
}
|
}
|
||||||
CATCH_LOG();
|
CATCH_LOG();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,12 +30,22 @@ namespace til
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::tuple<Args...> take()
|
void apply(const auto& func)
|
||||||
{
|
{
|
||||||
std::unique_lock guard{ _lock };
|
decltype(_pendingRunArgs) args;
|
||||||
auto pendingRunArgs = std::move(*_pendingRunArgs);
|
{
|
||||||
_pendingRunArgs.reset();
|
std::unique_lock guard{ _lock };
|
||||||
return pendingRunArgs;
|
args = std::exchange(_pendingRunArgs, std::nullopt);
|
||||||
|
}
|
||||||
|
// Theoretically it should always have a value, because the throttled_func
|
||||||
|
// should not call the callback without there being a reason.
|
||||||
|
// But in practice a failure here was observed at least once.
|
||||||
|
// It's unknown to me what caused it, so the best we can do is avoid a crash.
|
||||||
|
assert(args.has_value());
|
||||||
|
if (args)
|
||||||
|
{
|
||||||
|
std::apply(func, *args);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
explicit operator bool() const
|
explicit operator bool() const
|
||||||
@ -60,10 +70,12 @@ namespace til
|
|||||||
return _isPending.exchange(true, std::memory_order_relaxed);
|
return _isPending.exchange(true, std::memory_order_relaxed);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::tuple<> take()
|
void apply(const auto& func)
|
||||||
{
|
{
|
||||||
reset();
|
if (_isPending.exchange(false, std::memory_order_relaxed))
|
||||||
return {};
|
{
|
||||||
|
func();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void reset()
|
void reset()
|
||||||
@ -171,31 +183,24 @@ namespace til
|
|||||||
void flush()
|
void flush()
|
||||||
{
|
{
|
||||||
WaitForThreadpoolTimerCallbacks(_timer.get(), true);
|
WaitForThreadpoolTimerCallbacks(_timer.get(), true);
|
||||||
if (_storage)
|
_timer_callback(nullptr, this, nullptr);
|
||||||
{
|
|
||||||
_trailing_edge();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static void __stdcall _timer_callback(PTP_CALLBACK_INSTANCE /*instance*/, PVOID context, PTP_TIMER /*timer*/) noexcept
|
static void __stdcall _timer_callback(PTP_CALLBACK_INSTANCE /*instance*/, PVOID context, PTP_TIMER /*timer*/) noexcept
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
static_cast<throttled_func*>(context)->_trailing_edge();
|
const auto self = static_cast<throttled_func*>(context);
|
||||||
}
|
|
||||||
CATCH_LOG()
|
|
||||||
|
|
||||||
void _trailing_edge()
|
|
||||||
{
|
|
||||||
if constexpr (Leading)
|
if constexpr (Leading)
|
||||||
{
|
{
|
||||||
_storage.reset();
|
self->_storage.reset();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::apply(_func, _storage.take());
|
self->_storage.apply(self->_func);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
CATCH_LOG()
|
||||||
|
|
||||||
wil::unique_threadpool_timer _createTimer()
|
wil::unique_threadpool_timer _createTimer()
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user