summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2015-09-19 11:24:01 +0900
committerYasuo Ohgaki <yohgaki@php.net>2015-09-19 11:26:14 +0900
commit2f7cc862d763bcd3ca09f1164df8cdec929b75b9 (patch)
tree5ba3349cc388b90c2f8f3739301425f5a4b42262
parent7680194a930165f50194a48e324d11001aef3465 (diff)
downloadphp-git-2f7cc862d763bcd3ca09f1164df8cdec929b75b9.tar.gz
Fixed bug #70529 Session read causes "String is not zero-terminated" error
-rw-r--r--NEWS4
-rw-r--r--ext/session/mod_files.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index fb99eb0c4e..57b7a73c11 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ PHP NEWS
. Fixed bug #70481 (Memory leak in auto_global_copy_ctor() in ZTS build).
(Laruence)
+- Session:
+ . Fixed bug #70529 (Session read causes "String is not zero-terminated" error).
+ (Yasuo)
+
17 Sep 2015, PHP 7.0.0 RC 3
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index f5256206ff..8301b73f5e 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -519,6 +519,7 @@ PS_READ_FUNC(files)
return FAILURE;
}
+ ZSTR_VAL(*val)[ZSTR_LEN(*val)] = '\0';
return SUCCESS;
}