Merge pull request #5231 from alalek:fix_tls

9 years ago · 680efe1a97
parent 44f8670719 b8956d0111
commit 680efe1a97
1 changed files with 3 additions and 2 deletions
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@ -1089,9 +1089,10 @@ public:

        for(size_t i = 0; i < threads.size(); i++)
        {
-            if(threads[i]->slots[slotIdx])
+            std::vector<void*>& thread_slots = threads[i]->slots;
+            if (thread_slots.size() > slotIdx && thread_slots[slotIdx])
            {
-                dataVec.push_back(threads[i]->slots[slotIdx]);
+                dataVec.push_back(thread_slots[slotIdx]);
                threads[i]->slots[slotIdx] = 0;
            }
        }