iliaa           Tue Oct 10 17:32:51 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/com_dotnet     com_com.c 
    /php-src    NEWS 
  Log:
  Fixed bug #38198 (possible crash when COM reports an exception).
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_com.c?r1=1.16.2.2&r2=1.16.2.2.2.1&diff_format=u
Index: php-src/ext/com_dotnet/com_com.c
diff -u php-src/ext/com_dotnet/com_com.c:1.16.2.2 
php-src/ext/com_dotnet/com_com.c:1.16.2.2.2.1
--- php-src/ext/com_dotnet/com_com.c:1.16.2.2   Thu Jan 26 11:17:34 2006
+++ php-src/ext/com_dotnet/com_com.c    Tue Oct 10 17:32:50 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: com_com.c,v 1.16.2.2 2006/01/26 11:17:34 rrichards Exp $ */
+/* $Id: com_com.c,v 1.16.2.2.2.1 2006/10/10 17:32:50 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -340,7 +340,7 @@
 {
        HRESULT hr;
        unsigned int arg_err;
-       EXCEPINFO e;
+       EXCEPINFO e = {0};
 
        hr = IDispatch_Invoke(V_DISPATCH(&obj->v), id_member,
                &IID_NULL, LOCALE_SYSTEM_DEFAULT, flags, disp_params, v, &e, 
&arg_err);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.296&r2=1.2027.2.547.2.297&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.296 php-src/NEWS:1.2027.2.547.2.297
--- php-src/NEWS:1.2027.2.547.2.296     Mon Oct  9 18:08:33 2006
+++ php-src/NEWS        Tue Oct 10 17:32:50 2006
@@ -4,6 +4,7 @@
 - Fixed PECL bug #8816 (issue in php_oci_statement_fetch with more than one 
   piecewise column) (jeff at badtz-maru dot com, Tony)
 - Fixed bug #39067 (getDeclaringClass() and private properties). (Tony)
+- Fixed bug #38198 (possible crash when COM reports an exception). (Ilia)
 - Fixed bug #37262 (var_export() does not escape \0 character). (Ilia)
 
 05 Oct 2006, PHP 5.2.0RC5

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to