diff options
-rw-r--r-- | src/webchannel/qmetaobjectpublisher.cpp | 21 | ||||
-rw-r--r-- | src/webchannel/qmetaobjectpublisher_p.h | 4 | ||||
-rw-r--r-- | tests/auto/webchannel/tst_webchannel.cpp | 3 |
3 files changed, 20 insertions, 8 deletions
diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp index 677f79c..536eb5c 100644 --- a/src/webchannel/qmetaobjectpublisher.cpp +++ b/src/webchannel/qmetaobjectpublisher.cpp @@ -754,14 +754,21 @@ QJsonValue QMetaObjectPublisher::wrapResult(const QVariant &result, QWebChannelA wrappedObjects.insert(id, oi); initializePropertyUpdates(object, classInfo); - } else if (wrappedObjects.contains(id)) { - Q_ASSERT(object == wrappedObjects.value(id).object); - // check if this transport is already assigned to the object - if (transport && !wrappedObjects.value(id).transports.contains(transport)) { - wrappedObjects[id].transports.append(transport); - transportedWrappedObjects.insert(transport, id); + } else { + auto oi = wrappedObjects.find(id); + if (oi != wrappedObjects.end() && !oi->isBeingWrapped) { + Q_ASSERT(object == oi->object); + // check if this transport is already assigned to the object + if (transport && !oi->transports.contains(transport)) { + oi->transports.append(transport); + transportedWrappedObjects.insert(transport, id); + } + // QTBUG-84007: Block infinite recursion for self-contained objects + // which have already been wrapped + oi->isBeingWrapped = true; + classInfo = classInfoForObject(object, transport); + oi->isBeingWrapped = false; } - classInfo = classInfoForObject(object, transport); } QJsonObject objectInfo; diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h index 6030de2..bbd9875 100644 --- a/src/webchannel/qmetaobjectpublisher_p.h +++ b/src/webchannel/qmetaobjectpublisher_p.h @@ -292,13 +292,15 @@ private: QHash<const QObject *, QString> registeredObjectIds; // Groups individually wrapped objects with their class information and the transports that have access to it. + // Also tags objects that are in the process of being wrapped to prevent infinite recursion. struct ObjectInfo { ObjectInfo(QObject *o = nullptr) - : object(o) + : object(o), isBeingWrapped(false) {} QObject *object; QVector<QWebChannelAbstractTransport*> transports; + bool isBeingWrapped; }; // Map of objects wrapped from invocation returns diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp index a1e824b..181da9e 100644 --- a/tests/auto/webchannel/tst_webchannel.cpp +++ b/tests/auto/webchannel/tst_webchannel.cpp @@ -936,6 +936,9 @@ void TestWebChannel::testInfiniteRecursion() channel.d_func()->publisher->initializeClient(m_dummyTransport); QJsonObject objectInfo = channel.d_func()->publisher->wrapResult(QVariant::fromValue(&obj), m_dummyTransport).toObject(); + + // Wrap the result twice to test for QTBUG-84007. A single result wrap will not trigger all recursion paths. + objectInfo = channel.d_func()->publisher->wrapResult(QVariant::fromValue(&obj), m_dummyTransport).toObject(); } void TestWebChannel::testAsyncObject() |