From: andy wharmby <wharmby@php.net>
Date: Fri, 2 Feb 2007 15:44:06 +0000 (+0000)
Subject:  Fixed bug #37927 (Prevent trap when COM extension processes argument of type VT_DISP... 
X-Git-Tag: php-5.2.1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74cafe08403cae6c1a2a56da0b58eb88258bb861;p=php

 Fixed bug #37927 (Prevent trap when COM extension processes argument of type VT_DISPATCH|VT_REF)
---

diff --git a/NEWS b/NEWS
index 7128b54e90..2fcf90cffb 100644
--- a/NEWS
+++ b/NEWS
@@ -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);
 	}