Merge pull request #3787 from Dmitry-Me:fixNullPointerDereference2

aa113c5a · Vadim Pisarevsky · f9b8ce1d · d164d513 · aa113c5a
Commit aa113c5a authored Mar 05, 2015 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

matrix.cpp modules/core/src/matrix.cpp +4 -1

No files found.
--- 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) )
            {