diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-16 23:42:48 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-16 23:43:18 +0200 |
| commit | 48cf8dd9c32926775798a11ee0c0fc81d8bf3c7a (patch) | |
| tree | ccafd31ecf9cd3704ba3ad72a4159ab1ca159283 /ext/session/mod_files.c | |
| parent | 0e76cafaf18dbbb6af609b2e765fe68fd30b8002 (diff) | |
| parent | 66826730702d3ed3d6d45320ad1276977e67bb9e (diff) | |
| download | php-git-48cf8dd9c32926775798a11ee0c0fc81d8bf3c7a.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/session/mod_files.c')
| -rw-r--r-- | ext/session/mod_files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index ed32f3564c..b33f07e69e 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -114,7 +114,7 @@ static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, cons size_t n; key_len = strlen(key); - if (key_len <= data->dirdepth || + if (!data || key_len <= data->dirdepth || buflen < (strlen(data->basedir) + 2 * data->dirdepth + key_len + 5 + sizeof(FILE_PREFIX))) { return NULL; } |