Fix fallback conversion of recognized objects

All objects are added the list of visited objects, but only those
that were not recognized more specific than 'Object' are removed before
trying the fallback conversion. This prevents the fallback from working
as the algorithm will assume we are looping.

Task-number: QTBUG-39951
Change-Id: I1d538c452092485b371c335e53f16db162bd4fb1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/Source/WebCore/bridge/qt/qt_runtime.cpp b/Source/WebCore/bridge/qt/qt_runtime.cpp
index e6a3e6b9f..58259ff3e 100644
--- a/Source/WebCore/bridge/qt/qt_runtime.cpp
+++ b/Source/WebCore/bridge/qt/qt_runtime.cpp
@@ -638,7 +638,7 @@ QVariant convertValueToQVariant(JSContextRef context, JSValueRef value, QMetaTyp
                         *distance = 1;
                     return QVariant();
                 }
-                if (type == Object) {
+                if (JSValueIsObject(context, value)) {
                     // Since we haven't really visited this object yet, we remove it
                     visitedObjects->remove(object);
                 }