From: Pierre Joye <pajoye@php.net>
Date: Wed, 19 Jan 2011 14:21:46 +0000 (+0000)
Subject: - path len check and fix buffer overrun
X-Git-Tag: php-5.3.6RC1~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=434f3654dac9ee915a5b4f0a4dbc384d33e1d38c;p=php

- path len check and fix buffer overrun
---

diff --git a/main/php_ini.c b/main/php_ini.c
index c842532834..5b13adb258 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -824,12 +824,15 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len TSRMLS_DC)
 
 #if PHP_WIN32
 	char path_bak[MAXPATHLEN];
+#endif
 
 	if (path_len > MAXPATHLEN) {
 		return;
 	}
+
+#if PHP_WIN32
 	memcpy(path_bak, path, path_len);
-	path_bak[path_len] = 0;
+	path_bak[path_len - 1] = 0;
 	TRANSLATE_SLASHES_LOWER(path_bak);
 	path = path_bak;
 #endif