From afcd7e7f93665929ab7474a801b612294355e006 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 16 Apr 2023 19:06:55 -0400 Subject: [PATCH] haze: event_reactor: fix size validation --- troposphere/haze/include/haze/event_reactor.hpp | 1 + troposphere/haze/source/event_reactor.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/troposphere/haze/include/haze/event_reactor.hpp b/troposphere/haze/include/haze/event_reactor.hpp index 86a79a212..71d2c2123 100644 --- a/troposphere/haze/include/haze/event_reactor.hpp +++ b/troposphere/haze/include/haze/event_reactor.hpp @@ -42,6 +42,7 @@ namespace haze { public: template Result WaitFor(s32 *out_arg_waiter, Args &&... arg_waiters) { + static_assert(sizeof...(Args) > 0); const Waiter arg_waiter_array[] = { arg_waiters... }; return this->WaitForImpl(out_arg_waiter, arg_waiter_array, sizeof...(Args)); } diff --git a/troposphere/haze/source/event_reactor.cpp b/troposphere/haze/source/event_reactor.cpp index df3a88e60..c570a4ca1 100644 --- a/troposphere/haze/source/event_reactor.cpp +++ b/troposphere/haze/source/event_reactor.cpp @@ -49,7 +49,7 @@ namespace haze { } 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); while (true) {