fix TLS implementation (closes #5967)

c7ccde69 · Alexander Alekhin · 3d2fc6c2 · c7ccde69
Commit c7ccde69 authored Jan 14, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 7 deletions

system.cpp modules/core/src/system.cpp +13 -7

No files found.
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -1085,11 +1085,14 @@ public:

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

@@ -1116,9 +1119,12 @@ public:

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