diff options
| author | Anatol Belski <ab@php.net> | 2013-07-15 17:35:29 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-07-15 17:35:29 +0200 |
| commit | e7a4cf8d7ee68ade2901c1069f2af7ff14273333 (patch) | |
| tree | 24ad60417dcb87a37a8bc37755543b4673e4abef /main | |
| parent | 904c5d7ba89ec411a7dcde6a848640cbb56a45f9 (diff) | |
| parent | 9561e598a0b0abfa6f41550830791a5350a1f837 (diff) | |
| download | php-git-e7a4cf8d7ee68ade2901c1069f2af7ff14273333.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix buffer overrun
Diffstat (limited to 'main')
| -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 cb2c7ea808..e9529a2d29 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -802,7 +802,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; } |