Merge pull request #3787 from Dmitry-Me:fixNullPointerDereference2

10 years ago · aa113c5a85
parent f9b8ce1d25 d164d51380
commit aa113c5a85
1 changed files with 4 additions and 1 deletions
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@ -205,9 +205,12 @@ public:

    void deallocate(UMatData* u) const
    {
+        if(!u)
+            return;
+
        CV_Assert(u->urefcount >= 0);
        CV_Assert(u->refcount >= 0);
-        if(u && u->refcount == 0)
+        if(u->refcount == 0)
        {
            if( !(u->flags & UMatData::USER_ALLOCATED) )
            {