Merge pull request #3687 from Dmitry-Me:fixPossibleNullPtrDeref

This commit is contained in:
Vadim Pisarevsky 2015-02-10 12:17:11 +00:00
commit 5466e321b8

View File

@ -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) )
{