diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-10-27 20:38:12 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-10-27 20:38:12 +0100 |
| commit | 749e5ad39dbac3f4f62be438367f8cdf90056815 (patch) | |
| tree | ad0677df3bf44a6761380686e400ffd878585288 /ext/com_dotnet/com_variant.c | |
| parent | 4ed39205864f58ba7c368e4ae1362d8214469fd9 (diff) | |
| download | php-749e5ad39dbac3f4f62be438367f8cdf90056815.tar.gz | |
New upstream version 5.4.21upstream/5.4.21
Diffstat (limited to 'ext/com_dotnet/com_variant.c')
| -rw-r--r-- | ext/com_dotnet/com_variant.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c index 853b7df4c..556f356b9 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; @@ -429,7 +430,7 @@ PHP_FUNCTION(com_variant_create_instance) /* If already an array and VT_ARRAY is passed then: - if only VT_ARRAY passed then do not perform a conversion - if VT_ARRAY plus other type passed then perform conversion - but will probably fail (origional behavior) + but will probably fail (original behavior) */ if ((vt & VT_ARRAY) && (V_VT(&obj->v) & VT_ARRAY)) { long orig_vt = vt; |