Fixed bug #37927 (Prevent trap when COM extension processes argument…

… of type VT_DISPATCH|VT_REF)
php · Feb 2, 2007 · 74cafe0 · 74cafe0
1 parent cda82bc
commit 74cafe0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);
 	}