Merge pull request opencv#4111 from mshabunin:fix-flann-access

smuscroft · Jun 22, 2015 · 945aa06 · 945aa06
2 parents 81e1c04 + fef7509
commit 945aa06
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
@@ -190,9 +190,13 @@ class NumpyAllocator : public MatAllocator
 
     void deallocate(UMatData* u) const
     {
-        if(u)
+        if(!u)
+            return;
+        PyEnsureGIL gil;
+        CV_Assert(u->urefcount >= 0);
+        CV_Assert(u->refcount >= 0);
+        if(u->refcount == 0)
         {
-            PyEnsureGIL gil;
             PyObject* o = (PyObject*)u->userdata;
             Py_XDECREF(o);
             delete u;