cvs: php-src /ext/com_dotnet com_misc.c
| From: | andy wharmby | Date: | Thu, 01 Feb 2007 18:05:11 +0000 |
| Subject: | cvs: php-src /ext/com_dotnet com_misc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42931@lists.php.net to get a copy of this message | ||
wharmby Thu Feb 1 18:05:11 2007 UTC
Modified files:
/php-src/ext/com_dotnet com_misc.c
Log:
ADW: Fixed COM extension bug #37927. Correct the processing of in/out arguments of type
VT_DISPATCH|VT_REF
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_misc.c?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/com_dotnet/com_misc.c
diff -u php-src/ext/com_dotnet/com_misc.c:1.12 php-src/ext/com_dotnet/com_misc.c:1.13
--- php-src/ext/com_dotnet/com_misc.c:1.12 Mon Jan 1 09:29:21 2007
+++ php-src/ext/com_dotnet/com_misc.c Thu Feb 1 18:05:10 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_misc.c,v 1.12 2007/01/01 09:29:21 sebastian Exp $ */
+/* $Id: com_misc.c,v 1.13 2007/02/01 18:05:10 wharmby Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -79,7 +79,7 @@
VariantInit(&obj->v);
VariantCopyInd(&obj->v, v);
- 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);
}