AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak if QMetaType::create is called for an unknown type

Browse Source 
The memory should be allocated only if we operates on a valid type,
It is a regression introduced by 3d575d4845

Change-Id: Ia31bccd5b41fe090c29df1aeaa69efb706cd25bb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Jędrzej Nowacki 2016-01-15 16:07:04 +01:00
parent 1e370a45bf
commit ad77422e82
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/kernel/qmetatype.cpp
View File

@ -1698,8 +1698,9 @@ bool QMetaType::load(QDataStream &stream, int type, void *data)
void *QMetaType::create(int type, const void *copy) void *QMetaType::create(int type, const void *copy)
{ {
QMetaType info(type); QMetaType info(type);
int size = info.sizeOf(); if (int size = info.sizeOf())
return info.construct(operator new(size), copy); return info.construct(operator new(size), copy);
return 0;
} }
/*! /*!