From 9b43d8a98aed87da9fb366cd916cd2e7747090db Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 21 Jan 2021 11:33:51 -0800
Subject: [PATCH] QJsonObject::take: add missing detach() call

We were modifying shared objects.

Fixes: QTBUG-89625
Change-Id: Id6bc735b79cf4beb9454fffd165c56476a5dec04
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
(cherry picked from commit 00b759a8d06dbec42232b1b8748c0725da7ced00)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/serialization/qjsonobject.cpp     |  1 +
 .../corelib/serialization/json/tst_qtjson.cpp | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/corelib/serialization/qjsonobject.cpp b/src/corelib/serialization/qjsonobject.cpp
index 0c4af59163f..a06af5d02dd 100644
--- a/src/corelib/serialization/qjsonobject.cpp
+++ b/src/corelib/serialization/qjsonobject.cpp
@@ -617,6 +617,7 @@ QJsonValue QJsonObject::takeImpl(T key)
     if (!keyExists)
         return QJsonValue(QJsonValue::Undefined);
 
+    detach();
     const QJsonValue v = QJsonPrivate::Value::fromTrustedCbor(o->extractAt(index + 1));
     removeAt(index / 2);
     return v;
diff --git a/tests/auto/corelib/serialization/json/tst_qtjson.cpp b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
index 2153c9eff7d..64f410d557e 100644
--- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
@@ -58,6 +58,7 @@ private Q_SLOTS:
     void testNumberComparisons();
 
     void testObjectSimple();
+    void testObjectTakeDetach();
     void testObjectSmallKeys();
     void testObjectInsertCopies();
     void testArraySimple();
@@ -575,6 +576,24 @@ void tst_QtJson::testObjectSimple()
     QCOMPARE(subvalue.toObject(), subobject);
 }
 
+void tst_QtJson::testObjectTakeDetach()
+{
+    QJsonObject object1, object2;
+    object1["key1"] = 1;
+    object1["key2"] = 2;
+    object2 = object1;
+
+    object1.take("key2");
+    object1.remove("key1");
+    QVERIFY(!object1.contains("key1"));
+    QVERIFY(object2.contains("key1"));
+    QVERIFY(object2.value("key1").isDouble());
+
+    QVERIFY(!object1.contains("key2"));
+    QVERIFY(object2.contains("key2"));
+    QVERIFY(object2.value("key2").isDouble());
+}
+
 void tst_QtJson::testObjectSmallKeys()
 {
     QJsonObject data1;