]> granicus.if.org Git - php/commitdiff
fix buffer overrun
authorAnatol Belski <ab@php.net>
Mon, 15 Jul 2013 15:34:36 +0000 (17:34 +0200)
committerAnatol Belski <ab@php.net>
Mon, 15 Jul 2013 15:34:36 +0000 (17:34 +0200)
main/php_ini.c

index bceb6e59f84a73931cfc8b8b35fdf92457de9ee3..444b4ce8443057fee9c2ba2acc09a2967c7b0320 100644 (file)
@@ -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;
        }