diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-10-27 20:38:12 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-10-27 20:38:12 +0100 |
| commit | 749e5ad39dbac3f4f62be438367f8cdf90056815 (patch) | |
| tree | ad0677df3bf44a6761380686e400ffd878585288 /main/php_ini.c | |
| parent | 4ed39205864f58ba7c368e4ae1362d8214469fd9 (diff) | |
| download | php-749e5ad39dbac3f4f62be438367f8cdf90056815.tar.gz | |
New upstream version 5.4.21upstream/5.4.21
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index bceb6e59f..444b4ce84 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -785,7 +785,12 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len TSRMLS_DC) char path_bak[MAXPATHLEN]; #endif +#if PHP_WIN32 + /* MAX_PATH is \0-terminated, path_len == MAXPATHLEN would overrun path_bak */ + if (path_len >= MAXPATHLEN) { +#else if (path_len > MAXPATHLEN) { +#endif return; } |