com php-src: Revert "fix leak in 7.0": ext/session/mod_files .c
| From: | Anatol Belski | Date: | Fri, 29 Jan 2016 19:46:47 +0000 |
| Subject: | com php-src: Revert "fix leak in 7.0": ext/session/mod_files .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90824@lists.php.net to get a copy of this message | ||
Commit: 57d9797b6f653ab86036f5b0dd4ff132cd967dc3
Author: Anatol Belski <ab@php.net> Fri, 29 Jan 2016 20:46:47 +0100
Parents: 16a99c6368c14210842c53534fd5081e43eaa9fc
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=57d9797b6f653ab86036f5b0dd4ff132cd967dc3
Log:
Revert "fix leak in 7.0"
This reverts commit ee49df011ce55f088908c54ef24ce4db45574414.
Changed paths:
M ext/session/mod_files.c
Diff:
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index b37b212..f0d4367 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -119,7 +119,7 @@ static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, cons
key_len = strlen(key);
if (key_len <= data->dirdepth ||
- buflen < (data->basedir_len + 2 * data->dirdepth + key_len + 5 + sizeof(FILE_PREFIX))) {
+ buflen < (strlen(data->basedir) + 2 * data->dirdepth + key_len + 5 +
sizeof(FILE_PREFIX))) {
return NULL;
}