diff options
| author | Anatol Belski <ab@php.net> | 2013-07-15 17:35:52 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-07-15 17:35:52 +0200 |
| commit | fb91fc6e2c6a8c6f96aa71f968efe9f712d9cc82 (patch) | |
| tree | 8e7b14629079589e15d4a92885a2c01565cf68b3 /main | |
| parent | af377da60aee64f66bb3f1a26653cce20dc146fd (diff) | |
| parent | e7a4cf8d7ee68ade2901c1069f2af7ff14273333 (diff) | |
| download | php-git-fb91fc6e2c6a8c6f96aa71f968efe9f712d9cc82.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
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; } |