Merge pull request #3787 from Dmitry-Me:fixNullPointerDereference2

This commit is contained in:
Vadim Pisarevsky 2015-03-05 12:19:02 +00:00
commit aa113c5a85

View File

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