summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2013-07-15 17:34:36 +0200
committerAnatol Belski <ab@php.net>2013-07-15 17:34:36 +0200
commit9561e598a0b0abfa6f41550830791a5350a1f837 (patch)
tree6515036350c1bd4924c2911fbec9e4a640126fd4
parente617679c0ba616551df62ad370a70d5cf610c270 (diff)
downloadphp-git-9561e598a0b0abfa6f41550830791a5350a1f837.tar.gz
fix buffer overrun
-rw-r--r--main/php_ini.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index bceb6e59f8..444b4ce844 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;
}