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

QMetaType: prevent memory leak on create() if the constructor throws

Browse Source 
The #ifdef wasn't necessary because destroy() had been using
__STDCPP_DEFAULT_NEW_ALIGNMENT__ without #if.

Change-Id: I3859764fed084846bcb0fffd17039570283d3eaf
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Thiago Macieira 2022-07-20 09:09:56 -07:00
parent 3695b35dfc
commit 1b96b645ec
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,18 @@ QT_IMPL_METATYPE_EXTERN_TAGGED(QtMetaTypePrivate::QPairVariantInterfaceImpl, QPa
using QtMetaTypePrivate::isInterfaceFor;
namespace {
struct QMetaTypeDeleter
{
const QtPrivate::QMetaTypeInterface *iface;
void operator()(void *data)
{
if (iface->alignment > __STDCPP_DEFAULT_NEW_ALIGNMENT__) {
operator delete(data, std::align_val_t(iface->alignment));
} else {
operator delete(data);
}
}
};
struct QMetaTypeCustomRegistry
{
@ -611,14 +623,14 @@ void *QMetaType::create(const void *copy) const
if (copy ? !isCopyConstructible() : !isDefaultConstructible())
return nullptr;
void *where =
#ifdef __STDCPP_DEFAULT_NEW_ALIGNMENT__
d_ptr->alignment > __STDCPP_DEFAULT_NEW_ALIGNMENT__ ?
operator new(d_ptr->size, std::align_val_t(d_ptr->alignment)) :
#endif
operator new(d_ptr->size);
QtMetaTypePrivate::construct(d_ptr, where, copy);
return where;
std::unique_ptr<void, QMetaTypeDeleter> where(nullptr, {d_ptr});
if (d_ptr->alignment > __STDCPP_DEFAULT_NEW_ALIGNMENT__)
where.reset(operator new(d_ptr->size, std::align_val_t(d_ptr->alignment)));
else
where.reset(operator new(d_ptr->size));
QtMetaTypePrivate::construct(d_ptr, where.get(), copy);
return where.release();
}
/*!
@ -634,11 +646,7 @@ void QMetaType::destroy(void *data) const
{
if (data && isDestructible()) {
QtMetaTypePrivate::destruct(d_ptr, data);
if (d_ptr->alignment > __STDCPP_DEFAULT_NEW_ALIGNMENT__) {
operator delete(data, std::align_val_t(d_ptr->alignment));
} else {
operator delete(data);
}
QMetaTypeDeleter{d_ptr}(data);
}
}