sniper Sun Nov 20 13:06:14 2005 EDT
Modified files:
/php-src/ext/standard basic_functions.c
Log:
- 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.736&r2=1.737&ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.736
php-src/ext/standard/basic_functions.c:1.737
--- php-src/ext/standard/basic_functions.c:1.736 Wed Nov 16 04:43:55 2005
+++ php-src/ext/standard/basic_functions.c Sun Nov 20 13:06:09 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.736 2005/11/16 09:43:55 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.737 2005/11/20 18:06:09 sniper Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -957,6 +957,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);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
