Changeset 70385 in vbox for trunk/include

Timestamp:

Dec 29, 2017 11:37:30 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119990

Message:

com/array.h: SafeIfaceArray(ComSafeArrayIn(I *, aArg)): We get here with empty arrays on windows and SafeArrayGetIID may then be IID_IDispatch rather than the IID expected by the caller.

File:

• trunk/include/VBox/com/array.h (modified) (1 diff)

trunk/include/VBox/com/array.h

@@ -1621 +1621 @@
             rc = SafeArrayGetIID(arg, &guid);
             AssertComRCReturnVoid(rc);
-            AssertMsgReturnVoid(InlineIsEqualGUID(COM_IIDOF(I), guid),
-                                ("Expected IID {%RTuuid}, got {%RTuuid}.\n",
-                                 &COM_IIDOF(I), &guid));
+            AssertMsgReturnVoid(InlineIsEqualGUID(COM_IIDOF(I), guid) || arg->rgsabound[0].cElements == 0 /* IDispatch if empty */,
+                                ("Expected IID {%RTuuid}, got {%RTuuid}.\n", &COM_IIDOF(I), &guid));
 
             rc = SafeArrayAccessData(arg, (void HUGEP **)&m.raw);