Merge pull request #3687 from Dmitry-Me:fixPossibleNullPtrDeref

5466e321 · Vadim Pisarevsky · f6b82d99 · ea48fcfc · 5466e321
Commit 5466e321 authored Feb 10, 2015 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

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

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