com php-src: refix bug #69111, crash in 5.6 only: ext/session/m od_files.c
| From: | Anatol Belski | Date: | Fri, 29 Jan 2016 10:24:19 +0000 |
| Subject: | com php-src: refix bug #69111, crash in 5.6 only: ext/session/m od_files.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90782@lists.php.net to get a copy of this message | ||
Commit: 25108babdbd17a8213c93c5139eda382c15f9aa4
Author: Anatol Belski <ab@php.net> Fri, 29 Jan 2016 11:24:19 +0100
Parents: a81cb64a96a824be8c6a02a45f6e6c16eca4604d
Branches: PHP-5.6 PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=25108babdbd17a8213c93c5139eda382c15f9aa4
Log:
refix bug #69111, crash in 5.6 only
Bugs:
https://bugs.php.net/69111
Changed paths:
M ext/session/mod_files.c
Diff:
diff --git a/ext/session/mod_files..c b/ext/session/mod_files.c
index 75b19a7..7e37381 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -360,6 +360,10 @@ PS_READ_FUNC(files)
PS(session_status) = php_session_active;
}
+ if (!PS(id)) {
+ return FAILURE;
+ }
+
ps_files_open(data, PS(id) TSRMLS_CC);
if (data->fd < 0) {
return FAILURE;