From 52637083eeaa1ab4b9468813a28d40feea81ab5e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 20 Sep 2018 11:28:05 +0200 Subject: Fix crash when querying properties Do not clear the variant structure for IDispatch* results. Amends 717cc8fa56b1eb39a372d0c5c561aa30dbbbdd47. Task-number: QTBUG-68415 Task-number: QTBUG-70628 Change-Id: Ibf739a77840dc68d5f9a8bd343a6b5d36e04d13b Reviewed-by: Andy Shaw --- src/activeqt/container/qaxbase.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 883f1e9..294d8dd 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -3684,7 +3684,10 @@ int QAxBase::internalInvoke(QMetaObject::Call call, int index, void **v) // get return value if (hres == S_OK && ret.vt != VT_EMPTY) { QVariantToVoidStar(VARIANTToQVariant(ret, slot.typeName()), v[0], slot.typeName()); - clearVARIANT(&ret); + if (ret.vt != VT_DISPATCH) + clearVARIANT(&ret); + else + VariantInit(&ret); } // update out parameters -- cgit v1.2.3