wharmby Fri Feb 2 15:44:06 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/com_dotnet com_misc.c
/php-src NEWS
Log:
Fixed bug #37927 (Prevent trap when COM extension processes argument of type
VT_DISPATCH|VT_REF)
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_misc.c?r1=1.8.2.2.2.2&r2=1.8.2.2.2.3&diff_format=u
Index: php-src/ext/com_dotnet/com_misc.c
diff -u php-src/ext/com_dotnet/com_misc.c:1.8.2.2.2.2
php-src/ext/com_dotnet/com_misc.c:1.8.2.2.2.3
--- php-src/ext/com_dotnet/com_misc.c:1.8.2.2.2.2 Fri Feb 2 15:27:35 2007
+++ php-src/ext/com_dotnet/com_misc.c Fri Feb 2 15:44:06 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_misc.c,v 1.8.2.2.2.2 2007/02/02 15:27:35 wharmby Exp $ */
+/* $Id: com_misc.c,v 1.8.2.2.2.3 2007/02/02 15:44:06 wharmby Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -80,7 +80,7 @@
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);
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.519&r2=1.2027.2.547.2.520&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.519 php-src/NEWS:1.2027.2.547.2.520
--- php-src/NEWS:1.2027.2.547.2.519 Fri Feb 2 15:27:35 2007
+++ php-src/NEWS Fri Feb 2 15:44:06 2007
@@ -325,6 +325,8 @@
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).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
