mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 20:09:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update matrix.cpp

Browse Source 
Fix race condition in getDefaultAllocator and setDefaultAllocator interaction / not threadsafe currently
This commit is contained in:
Matthias Grundmann 2017-05-10 16:04:02 -07:00 committed by Alexander Alekhin
parent d72ddc8255
commit cf4e9e5ce2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/src/matrix.cpp
View File

@ -222,7 +222,7 @@ public:
}; };
namespace namespace
{ {
MatAllocator* g_matAllocator = NULL; MatAllocator* volatile g_matAllocator = NULL;
} }
@ -230,7 +230,11 @@ MatAllocator* Mat::getDefaultAllocator()
{ {
if (g_matAllocator == NULL) if (g_matAllocator == NULL)
{ {
g_matAllocator = getStdAllocator(); cv::AutoLock lock(cv::getInitializationMutex());
if (g_matAllocator == NULL)
{
g_matAllocator = getStdAllocator();
}
} }
return g_matAllocator; return g_matAllocator;
} }