- path len check and fix buffer overrun

php · Jan 19, 2011 · 458ce08 · 458ce08
1 parent 86550a9
commit 458ce08
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/main/php_ini.c b/main/php_ini.c
@@ -820,12 +820,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