- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)

diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
index 8289322d6d1a15b1a827e97e19c207b651068822..556f356b9772d14f29e236656734605df7176dba 100644 (file)
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@@ -102,8 +102,9 @@ 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));
        
-       switch (Z_TYPE_P(z)) {
+       switch (ztype) {
                case IS_NULL:
                        V_VT(v) = VT_NULL;
                        break;