diff options
| author | andy wharmby <wharmby@php.net> | 2007-02-02 15:44:06 +0000 |
|---|---|---|
| committer | andy wharmby <wharmby@php.net> | 2007-02-02 15:44:06 +0000 |
| commit | 74cafe08403cae6c1a2a56da0b58eb88258bb861 (patch) | |
| tree | d0c981884f7d2e148f13471da4530ebb6ebde213 | |
| parent | cda82bc0a3f06d0a5328071ba46a65fe7c8fbef9 (diff) | |
| download | php-git-74cafe08403cae6c1a2a56da0b58eb88258bb861.tar.gz | |
Fixed bug #37927 (Prevent trap when COM extension processes argument of type VT_DISPATCH|VT_REF)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/com_dotnet/com_misc.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -325,6 +325,8 @@ PHP NEWS fastcgi). (Dmitry) - Fixed bug #38252 (Incorrect PDO error message on invalid default fetch mode). (Ilia) +- Fixed bug #37927 (Prevent trap when COM extension processes argument of + type VT_DISPATCH|VT_REF) (Andy) - Fixed bug #37773 (iconv_substr() gives "Unknown error" when string length = 1"). (Ilia) - Fixed bug #37627 (session save_path check checks the parent directory). diff --git a/ext/com_dotnet/com_misc.c b/ext/com_dotnet/com_misc.c index 2eb1c4eb2c..bc443e62a4 100644 --- a/ext/com_dotnet/com_misc.c +++ b/ext/com_dotnet/com_misc.c @@ -80,7 +80,7 @@ PHPAPI void php_com_wrap_variant(zval *z, VARIANT *v, VariantCopyInd(&obj->v, v); obj->modified = 0; - if (V_VT(&obj->v) == VT_DISPATCH) { + if ((V_VT(&obj->v) == VT_DISPATCH) && (V_DISPATCH(&obj->v) != NULL)) { IDispatch_GetTypeInfo(V_DISPATCH(&obj->v), 0, LANG_NEUTRAL, &obj->typeinfo); } |