summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2006-10-18 23:47:33 +0000
committerIlia Alshanetsky <iliaa@php.net>2006-10-18 23:47:33 +0000
commit76f23d4dcf8a3daed813def38271e62c47595a1c (patch)
treeadfc6ddcce68923aa70b220457c7153e301629e7
parentc79ba676737e82738a5ecc070c3f19d2dfb10a72 (diff)
downloadphp-git-76f23d4dcf8a3daed813def38271e62c47595a1c.tar.gz
Fixed bug #38400 (Use of com.typelib_file may cause a crash).
-rw-r--r--NEWS1
-rw-r--r--ext/com_dotnet/com_extension.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index f3f68b00e8..f4f86df734 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ PHP NEWS
- Fixed bug #38649 (uninit'd optional arg in stream_socket_sendto()). (Sara)
- Fixed bug #38465 (ReflectionParameter fails if default value is an access to
self::). (Johannes)
+- Fixed bug #38400 (Use of com.typelib_file may cause a crash). (Ilia)
- Fixed bug #38198 (possible crash when COM reports an exception). (Ilia)
- Fixed bug #37262 (var_export() does not escape \0 character). (Ilia)
- Fixed bug #36515 (Unlinking buckets from non-existant brigades). (Sara)
diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c
index 56526805ac..d0ec3bbb85 100644
--- a/ext/com_dotnet/com_extension.c
+++ b/ext/com_dotnet/com_extension.c
@@ -191,8 +191,6 @@ PHP_MINIT_FUNCTION(com_dotnet)
{
zend_class_entry ce, *tmp;
- REGISTER_INI_ENTRIES();
-
php_com_wrapper_minit(INIT_FUNC_ARGS_PASSTHRU);
php_com_persist_minit(INIT_FUNC_ARGS_PASSTHRU);
@@ -226,6 +224,8 @@ PHP_MINIT_FUNCTION(com_dotnet)
tmp->get_iterator = php_com_iter_get;
#endif
+ REGISTER_INI_ENTRIES();
+
#define COM_CONST(x) REGISTER_LONG_CONSTANT(#x, x, CONST_CS|CONST_PERSISTENT)
COM_CONST(CLSCTX_INPROC_SERVER);