iliaa Wed Oct 18 23:47:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/com_dotnet com_extension.c
Log:
Fixed bug #38400 (Use of com.typelib_file may cause a crash).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.310&r2=1.2027.2.547.2.311&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.310 php-src/NEWS:1.2027.2.547.2.311
--- php-src/NEWS:1.2027.2.547.2.310 Wed Oct 18 20:58:23 2006
+++ php-src/NEWS Wed Oct 18 23:47:33 2006
@@ -23,6 +23,7 @@
- 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)
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_extension.c?r1=1.17.2.2.2.3&r2=1.17.2.2.2.4&diff_format=u
Index: php-src/ext/com_dotnet/com_extension.c
diff -u php-src/ext/com_dotnet/com_extension.c:1.17.2.2.2.3
php-src/ext/com_dotnet/com_extension.c:1.17.2.2.2.4
--- php-src/ext/com_dotnet/com_extension.c:1.17.2.2.2.3 Fri Sep 8 05:52:00 2006
+++ php-src/ext/com_dotnet/com_extension.c Wed Oct 18 23:47:33 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_extension.c,v 1.17.2.2.2.3 2006/09/08 05:52:00 dmitry Exp $ */
+/* $Id: com_extension.c,v 1.17.2.2.2.4 2006/10/18 23:47:33 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -191,8 +191,6 @@
{
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 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
