Merge pull request #5231 from alalek:fix_tls

680efe1a · Maksim Shabunin · 44f86707 · b8956d01 · 680efe1a
Commit 680efe1a authored Aug 21, 2015 by Maksim Shabunin
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

system.cpp modules/core/src/system.cpp +3 -2

No files found.
--- 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;
            }
        }