summaryrefslogtreecommitdiff
path: root/ext/standard/basic_functions.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2012-10-31 15:55:04 +0100
committerAndrey Hristov <andrey@php.net>2012-10-31 15:55:04 +0100
commitf2f380407ac4138a483b43f9649695db36e42c8c (patch)
treee7048592c57ca7c0822c2cbe47cbf9f9e86679ea /ext/standard/basic_functions.c
parentd62bc53a4fb2058a06f356b5779a0db88f6e207c (diff)
parent8fb26e76ba463cfd38433bb2f19be84ff79b11b8 (diff)
downloadphp-git-f2f380407ac4138a483b43f9649695db36e42c8c.tar.gz
Merge branch 'master' of ssh://git.php.net/php-src
Diffstat (limited to 'ext/standard/basic_functions.c')
-rw-r--r--ext/standard/basic_functions.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index a30579e143..d6377df84d 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3732,6 +3732,11 @@ PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
PHP_RINIT_FUNCTION(basic) /* {{{ */
{
memset(BG(strtok_table), 0, 256);
+
+ BG(serialize_lock) = 0;
+ memset(&BG(serialize), 0, sizeof(BG(serialize)));
+ memset(&BG(unserialize), 0, sizeof(BG(unserialize)));
+
BG(strtok_string) = NULL;
BG(strtok_zval) = NULL;
BG(strtok_last) = NULL;