File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -552,14 +552,15 @@ PHP_METHOD(variant, __construct)
552
552
/**
553
553
* VT_ARRAY functionality
554
554
*
555
- * If already an array and VT_ARRAY is passed then:
556
- * - if only VT_ARRAY passed then do not perform a conversion
557
- * - if VT_ARRAY plus other type passed then perform conversion
555
+ * If already an array and VT_ARRAY is passed then perform conversion
558
556
*/
559
557
560
558
res = S_OK ;
561
559
SAFEARRAYBOUND Bound ;
562
560
561
+ if (vt == VT_ARRAY ) //By default VT_ARRAY is VT_ARRAY | VT_VARIANT
562
+ vt |= VT_VARIANT ;
563
+
563
564
if ((vt & ~VT_ARRAY ) && //new variant have some type except VT_ARRAY
564
565
(V_VT (& obj -> v ) & VT_ARRAY ) && //our variant is array
565
566
SafeArrayGetDim (V_ARRAY (& obj -> v )) == 1 && //our array have one dimension
You can’t perform that action at this time.
0 commit comments