diff options
| author | Felipe Pena <felipensp@gmail.com> | 2013-06-25 21:40:24 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2013-06-25 21:40:24 -0300 |
| commit | fba44be828a004c9ed20e413e08b9683ce5d8252 (patch) | |
| tree | 7c5a91ef7050b1f15afd22b13dfcbde7a6626535 /ext/com_dotnet | |
| parent | 91bd2de85c368cc8d6b9d662279333a43a519778 (diff) | |
| parent | e15ca39708cf2a4bbf4a60a1a29a7b979bd0dab0 (diff) | |
| download | php-git-fba44be828a004c9ed20e413e08b9683ce5d8252.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Update NEWS
- BFN
Diffstat (limited to 'ext/com_dotnet')
| -rw-r--r-- | ext/com_dotnet/com_variant.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c index 8289322d6d..556f356b97 100644 --- 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; |