sniper Sun Nov 20 13:07:32 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard basic_functions.c
/php-src NEWS
Log:
MFH: - Fixed bug #35243 (php_mblen() crashes when compiled with thread-safety
on Linux)
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.725.2.6&r2=1.725.2.7&ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.6
php-src/ext/standard/basic_functions.c:1.725.2.7
--- php-src/ext/standard/basic_functions.c:1.725.2.6 Wed Nov 16 04:31:20 2005
+++ php-src/ext/standard/basic_functions.c Sun Nov 20 13:07:27 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.6 2005/11/16 09:31:20 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.7 2005/11/20 18:07:27 sniper Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -953,6 +953,10 @@
memset(&BG(url_adapt_state), 0, sizeof(BG(url_adapt_state)));
memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex)));
+
+#if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T)
+ memset(&BG(mblen_state), 0, sizeof(BG(mblen_state)));
+#endif
BG(incomplete_class) = php_create_incomplete_class(TSRMLS_C);
}
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.209&r2=1.2027.2.210&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.209 php-src/NEWS:1.2027.2.210
--- php-src/NEWS:1.2027.2.209 Sun Nov 20 03:13:34 2005
+++ php-src/NEWS Sun Nov 20 13:07:28 2005
@@ -4,6 +4,8 @@
- Fixed bug #35293 (PDO segfaults when using persistent connections). (Tony)
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
+- Fixed bug #35243 (php_mblen() crashes when compiled with thread-safety
+ on Linux). (Patch: shulmanb at il dot ibm dot com, Jani)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
- Fixed bug #33201 (Crash when fetching some data types). (Frank)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
