From b523b2a81afc87d9464b8cea37cda04d39a35f4f Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 6 Apr 2018 15:35:17 -0700 Subject: [PATCH] more correct proxyID validation --- libraries/workload/src/workload/Space.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/workload/src/workload/Space.cpp b/libraries/workload/src/workload/Space.cpp index e254030d68..40491fa21e 100644 --- a/libraries/workload/src/workload/Space.cpp +++ b/libraries/workload/src/workload/Space.cpp @@ -121,14 +121,15 @@ uint32_t Space::copyProxyValues(Proxy* proxies, uint32_t numDestProxies) const { const Owner Space::getOwner(int32_t proxyID) const { std::unique_lock lock(_proxiesMutex); - if (_IDAllocator.checkIndex(proxyID)) { + if (isAllocatedID(proxyID) && (proxyID < (Index)_proxies.size())) { return _owners[proxyID]; } return Owner(); } uint8_t Space::getRegion(int32_t proxyID) const { - if (_IDAllocator.checkIndex(proxyID)) { + std::unique_lock lock(_proxiesMutex); + if (isAllocatedID(proxyID) && (proxyID < (Index)_proxies.size())) { return _proxies[proxyID].region; } return (uint8_t)Region::INVALID;