Fixed bug #38400 (Use of com.typelib_file may cause a crash).

diff --git a/NEWS b/NEWS
index f3f68b00e8077dc09b214fff8097408b19cd3bb3..f4f86df734fb95206066680e08bde197517e79a7 100644 (file)
--- 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 56526805ac871dd6a7a69e917055014397d0e441..d0ec3bbb8547997bc684f3a43ef78ef65db4cf57 100644 (file)
--- 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);