diff options
author | Lioncash <mathew1800@gmail.com> | 2018-07-24 15:55:15 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-07-24 15:55:17 +0200 |
commit | c73410bf2c58a17e0411456ea0ddb6d91872e079 (patch) | |
tree | edf9d381857d652b1be8edebe22496efa63e3034 | |
parent | Merge pull request #798 from lioncash/const (diff) | |
download | yuzu-c73410bf2c58a17e0411456ea0ddb6d91872e079.tar yuzu-c73410bf2c58a17e0411456ea0ddb6d91872e079.tar.gz yuzu-c73410bf2c58a17e0411456ea0ddb6d91872e079.tar.bz2 yuzu-c73410bf2c58a17e0411456ea0ddb6d91872e079.tar.lz yuzu-c73410bf2c58a17e0411456ea0ddb6d91872e079.tar.xz yuzu-c73410bf2c58a17e0411456ea0ddb6d91872e079.tar.zst yuzu-c73410bf2c58a17e0411456ea0ddb6d91872e079.zip |
-rw-r--r-- | src/core/hle/kernel/svc.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 7b41c9cfd..da7cacb57 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -165,11 +165,14 @@ static ResultCode WaitSynchronization(Handle* index, VAddr handles_address, u64 using ObjectPtr = SharedPtr<WaitObject>; std::vector<ObjectPtr> objects(handle_count); - for (int i = 0; i < handle_count; ++i) { - Handle handle = Memory::Read32(handles_address + i * sizeof(Handle)); - auto object = g_handle_table.Get<WaitObject>(handle); - if (object == nullptr) + for (u64 i = 0; i < handle_count; ++i) { + const Handle handle = Memory::Read32(handles_address + i * sizeof(Handle)); + const auto object = g_handle_table.Get<WaitObject>(handle); + + if (object == nullptr) { return ERR_INVALID_HANDLE; + } + objects[i] = object; } |