Fix infinite recursion when wrapping a self-contained object twice

The previous unit test for self-contained objects only wrapped the test
object once. After wrapping, a different code path is taken which still
exhibited infinite recursion. This patch addresses both the unit test
and the infinite recursion.
To fix the problem, a boolean in the ObjectInfo struct is toggled to
indicate whether the object in question is currently being wrapped. If
that is the case, the recursing code path is skipped.

[ChangeLog][General] Fixed infinite recursion when dealing with self
contained objects.

Fixes: QTBUG-84007
Pick-to: 5.15
Change-Id: Ie0898fb5f28cec91587897835ff937672d60f2a1
Reviewed-by: Kai Koehne <kai.koehne@qt.io>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h
index d7e2a5b..5e57e8c 100644
--- a/src/webchannel/qmetaobjectpublisher_p.h
+++ b/src/webchannel/qmetaobjectpublisher_p.h
@@ -295,13 +295,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;
         QList<QWebChannelAbstractTransport *> transports;
+        bool isBeingWrapped;
     };
 
     // Map of objects wrapped from invocation returns