summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2006-10-10 17:32:50 +0000
committerIlia Alshanetsky <iliaa@php.net>2006-10-10 17:32:50 +0000
commitdf5c300303c8cfb1569645fa45a3f7f3dc59201a (patch)
tree9cd7cb60b4977191e3163991dc2c1bd63ef7d970
parentb4974d5e68c6354ebf7e23da9c3a6da5cb7b5456 (diff)
downloadphp-git-df5c300303c8cfb1569645fa45a3f7f3dc59201a.tar.gz
Fixed bug #38198 (possible crash when COM reports an exception).
-rw-r--r--NEWS1
-rw-r--r--ext/com_dotnet/com_com.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index d5bc2d0d5d..5e8334a8b5 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ PHP NEWS
- 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
diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c
index e8dd8d2e6f..706dca6fe1 100644
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@@ -340,7 +340,7 @@ HRESULT php_com_invoke_helper(php_com_dotnet_object *obj, DISPID id_member,
{
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);