mirrors/Atmosphere
0
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-08-09 09:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

haze: event_reactor: fix size validation

Browse source
This commit is contained in:
Liam 2023-04-16 19:06:55 -04:00
commit afcd7e7f93
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
troposphere/haze/include/haze/event_reactor.hpp
View file

@ -42,6 +42,7 @@ namespace haze {
public: public:
template <typename... Args> template <typename... Args>
Result WaitFor(s32 *out_arg_waiter, Args &&... arg_waiters) { Result WaitFor(s32 *out_arg_waiter, Args &&... arg_waiters) {
static_assert(sizeof...(Args) > 0);
const Waiter arg_waiter_array[] = { arg_waiters... }; const Waiter arg_waiter_array[] = { arg_waiters... };
return this->WaitForImpl(out_arg_waiter, arg_waiter_array, sizeof...(Args)); return this->WaitForImpl(out_arg_waiter, arg_waiter_array, sizeof...(Args));
} }

2
troposphere/haze/source/event_reactor.cpp
View file

@ -49,7 +49,7 @@ namespace haze {
} }
Result EventReactor::WaitForImpl(s32 *out_arg_waiter, const Waiter *arg_waiters, s32 num_arg_waiters) { Result EventReactor::WaitForImpl(s32 *out_arg_waiter, const Waiter *arg_waiters, s32 num_arg_waiters) {
HAZE_ASSERT(0 <= num_arg_waiters && num_arg_waiters <= svc::ArgumentHandleCountMax); HAZE_ASSERT(0 < num_arg_waiters && num_arg_waiters <= svc::ArgumentHandleCountMax);
HAZE_ASSERT(m_num_wait_objects + num_arg_waiters <= svc::ArgumentHandleCountMax); HAZE_ASSERT(m_num_wait_objects + num_arg_waiters <= svc::ArgumentHandleCountMax);
while (true) { while (true) {