From af22ccf5605c6b7b20b845fb2b4003d3f56d8bc9 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 18 Sep 2020 13:00:21 +0200
Subject: Fix a double deletion in QDomAttr::setNodeValue()

Check the reference count before deleting. Patch
as contributed on bug report.

Pick-to: 5.15 5.12
Fixes: QTBUG-86547
Change-Id: I2cb197e3eeda7ade2442c23f6b4f1ae6ff2ff810
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/xml/dom/qdom.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/xml')

diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index 571e7fb0ac..43e9034ee9 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -3625,7 +3625,9 @@ void QDomAttrPrivate::setNodeValue(const QString& v)
     // keep the refcount balanced: appendChild() does a ref anyway.
     t->ref.deref();
     if (first) {
-        delete removeChild(first);
+        auto removed = removeChild(first);
+        if (removed && !removed->ref)
+            delete removed;
     }
     appendChild(t);
 }
-- 
cgit v1.2.3