Merge pull request #3687 from Dmitry-Me:fixPossibleNullPtrDeref

10 years ago · 5466e321b8
parent f6b82d99ad ea48fcfc9f
commit 5466e321b8
1 changed files with 4 additions and 1 deletions
--- a/modules/core/src/cuda_host_mem.cpp
+++ b/modules/core/src/cuda_host_mem.cpp
@ -107,10 +107,13 @@ 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) )
            {