com php-src: Fixed bug #72569 DOTNET/COM array parameters broke in PHP7: ext/com_dotnet/com_variant.c

From: Date: Tue, 12 Jul 2016 12:58:50 +0000
Subject: com php-src: Fixed bug #72569 DOTNET/COM array parameters broke in PHP7: ext/com_dotnet/com_variant.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92966@lists.php.net to get a copy of this message
Commit: 3e8dbb3e5d763166e6f03903c931161d5f2706ed Author: Anatol Belski <ab@php.net> Tue, 12 Jul 2016 14:58:13 +0200 Parents: 5fbcc2b90f6245cf1c20d41d2cd07fde711ccadd Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3e8dbb3e5d763166e6f03903c931161d5f2706ed Log: Fixed bug #72569 DOTNET/COM array parameters broke in PHP7 Bugs: https://bugs.php.net/72569 Changed paths: M ext/com_dotnet/com_variant.c Diff: diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c index 6a5dc9d..cae992d 100644 --- a/ext/com_dotnet/com_variant.c +++ b/ext/com_dotnet/com_variant.c @@ -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:

« previous php.cvs (#92966) next »