--- embedaddon/php/ext/standard/php_string.h	2013/07/22 01:32:05	1.1.1.3
+++ embedaddon/php/ext/standard/php_string.h	2014/06/15 20:03:57	1.1.1.4
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_string.h,v 1.1.1.3 2013/07/22 01:32:05 misho Exp $ */
+/* $Id: php_string.h,v 1.1.1.4 2014/06/15 20:03:57 misho Exp $ */
 
 /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
 
@@ -156,7 +156,7 @@ PHPAPI char *php_strerror(int errnum);
 # define php_mblen(ptr, len) 1
 #else
 # if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T)
-#  define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)): (int)mbrlen(ptr, len, &BG(mblen_state)))
+#  define php_mblen(ptr, len) ((ptr) == NULL ? memset(&BG(mblen_state), 0, sizeof(BG(mblen_state))): (int)mbrlen(ptr, len, &BG(mblen_state)))
 # else
 #  define php_mblen(ptr, len) mblen(ptr, len)
 # endif