generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3687 from Dmitry-Me:fixPossibleNullPtrDeref

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-02-10 12:17:11 +00:00
parent f6b82d99ad ea48fcfc9f
commit 5466e321b8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/cuda_host_mem.cpp
View File

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