From 38d1444a606679228b2a3c1d743f00225f6c25a1 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri, 29 Jan 2021 17:22:30 +0100
Subject: [PATCH] Do delete on QMetaType::destroy() even without dtor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As we call operator new on create(), we also need to delete on
destroy(). Otherwise we leak memory.

Change-Id: Ib80fe96c4173cba6fa474d3c81d88fe603d1ded2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/kernel/qmetatype.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 859a8946a44..06dbdbde181 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -594,8 +594,9 @@ void *QMetaType::create(const void *copy) const
 */
 void QMetaType::destroy(void *data) const
 {
-    if (d_ptr && d_ptr->dtor) {
-        d_ptr->dtor(d_ptr, data);
+    if (d_ptr) {
+        if (d_ptr->dtor)
+            d_ptr->dtor(d_ptr, data);
         if (d_ptr->alignment > __STDCPP_DEFAULT_NEW_ALIGNMENT__) {
             operator delete(data, std::align_val_t(d_ptr->alignment));
         } else {