summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2011-07-18 21:00:59 +0000
committerPierre Joye <pajoye@php.net>2011-07-18 21:00:59 +0000
commit8d1012b2c3cb89566ea4e8a9fb5fc782d7f2b877 (patch)
treecef4e97b67341148ba1cc63e0e11805cfade5b0d
parent1d3696eecb31b924c207886da203830411f868f7 (diff)
downloadphp-git-8d1012b2c3cb89566ea4e8a9fb5fc782d7f2b877.tar.gz
- MFH: Fixed bug #54204 (Can't set a value with a PATH section in php.ini).
-rw-r--r--NEWS2
-rw-r--r--main/php_ini.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a1b2aa45bd..b8462bc9e4 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ PHP NEWS
(Pierre)
. Fixed bug #55014 (Compile failure due to improper use of ctime_r()). (Ilia)
. Fixed bug #54332 (Crash in zend_mm_check_ptr // Heap corruption). (Dmitry)
+ . Fixed bug #54204 (Can't set a value with a PATH section in php.ini).
+ (Pierre)
. Fixed bug #54305 (Crash in gc_remove_zval_from_buffer). (Dmitry)
. Fixed bug #53727 (Inconsistent behavior of is_subclass_of with interfaces)
(Ralph Schindler, Dmitry)
diff --git a/main/php_ini.c b/main/php_ini.c
index 5b13adb258..53e5cfc8d2 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -832,7 +832,7 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len TSRMLS_DC)
#if PHP_WIN32
memcpy(path_bak, path, path_len);
- path_bak[path_len - 1] = 0;
+ path_bak[path_len] = 0;
TRANSLATE_SLASHES_LOWER(path_bak);
path = path_bak;
#endif