]> granicus.if.org Git - php/commitdiff
Fixed bug #72569 DOTNET/COM array parameters broke in PHP7
authorAnatol Belski <ab@php.net>
Tue, 12 Jul 2016 12:58:13 +0000 (14:58 +0200)
committerAnatol Belski <ab@php.net>
Tue, 12 Jul 2016 12:58:50 +0000 (14:58 +0200)
ext/com_dotnet/com_variant.c

index 6a5dc9dacb286d166767090f3ff3bcf80c2bc7cf..cae992dbb77e2913dd8b46b7134e8ee42f52c7c1 100644 (file)
@@ -100,7 +100,12 @@ PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codep
 {
        OLECHAR *olestring;
        php_com_dotnet_object *obj;
-       zend_uchar ztype = (z == NULL ? IS_NULL : Z_TYPE_P(z));
+       zend_uchar ztype = IS_NULL;
+
+       if (z) {
+               ZVAL_DEREF(z);
+               ztype = Z_TYPE_P(z);
+       }
 
        switch (ztype) {
                case IS_NULL: