--- embedaddon/php/ext/com_dotnet/com_variant.c 2013/07/22 01:31:38 1.1.1.3 +++ embedaddon/php/ext/com_dotnet/com_variant.c 2013/10/14 08:02:09 1.1.1.4 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_variant.c,v 1.1.1.3 2013/07/22 01:31:38 misho Exp $ */ +/* $Id: com_variant.c,v 1.1.1.4 2013/10/14 08:02:09 misho Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -102,8 +102,9 @@ PHP_COM_DOTNET_API void php_com_variant_from_zval(VARI { 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;