QQmlPropertyBinding: Re-fetch binding data after reset()

Pick-to: 6.2 6.5 6.6
Fixes: QTBUG-114430
Change-Id: I13773e7eba3603350b492c7649102a8131a9829c
Reviewed-by: Fabian Kosmale <[email protected]>

Author: ulfhermannqt

src/qml/qml/qqmlpropertybinding.cpp

@@ -230,10 +230,17 @@ void QQmlPropertyBinding::handleUndefinedAssignment(QQmlEnginePrivate *ep, void
         setIsUndefined(true);
         //suspend binding evaluation state for reset and subsequent read
         auto state = QtPrivate::suspendCurrentBindingStatus();
-        prop.reset();
+        prop.reset(); // May re-allocate the bindingData
         QVariant currentValue = QVariant(prop.propertyMetaType(), propertyDataPtr);
         QtPrivate::restoreBindingStatus(state);
         writeBackCurrentValue(std::move(currentValue));
+
+        // Re-fetch binding data
+        bindingData = storage->bindingData(propertyDataPtr);
+        if (!bindingData)
+            bindingData = bindingDataFromPropertyData(propertyDataPtr, propertyData->propType());
+        bindingDataPointer = QPropertyBindingDataPointer {bindingData};
+
         // reattach the binding (without causing a new notification)
         if (Q_UNLIKELY(bindingData->d() & QtPrivate::QPropertyBindingData::BindingBit)) {
             qCWarning(lcQQPropertyBinding) << "Resetting " << prop.name() << "due to the binding becoming undefined  caused a new binding to be installed\n"