com php-src: Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function): NEWS sapi/cli/php_cli_server.c

From: Date: Sun, 15 Oct 2017 02:28:28 +0000
Subject: com php-src: Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function): NEWS sapi/cli/php_cli_server.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-99741@lists.php.net to get a copy of this message
Commit: 816758eda2bcdd69ba505fb6bbb79124a7bf2254 Author: Xinchen Hui <laruence@gmail.com> Sun, 15 Oct 2017 10:28:28 +0800 Parents: 397f5cb687f4f31cb0dec85ba5a87237394ca12d Branches: PHP-7.0 PHP-7.1 PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=816758eda2bcdd69ba505fb6bbb79124a7bf2254 Log: Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function) Bugs: https://bugs.php.net/75287 Changed paths: M NEWS M sapi/cli/php_cli_server.c Diff: diff --git a/NEWS b/NEWS index 11223dd..de12a7f 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,10 @@ PHP NEWS . Fixed bug #75368 (mmap/munmap trashing on unlucky allocations). (Nikita, Dmitry) +- CLI: + . Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown + function). (Laruence) + - Exif: . Fixed bug #75301 (Exif extension has built in revision version). (Peter Kokot) diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 39ded2f..48480bb 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2106,12 +2106,6 @@ static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server { int decline = 0; zend_file_handle zfd; - char *old_cwd; - - ALLOCA_FLAG(use_heap) - old_cwd = do_alloca(MAXPATHLEN, use_heap); - old_cwd[0] = '\0'; - php_ignore_value(VCWD_GETCWD(old_cwd, MAXPATHLEN - 1)); zfd.type = ZEND_HANDLE_FILENAME; zfd.filename = server->router; @@ -2133,12 +2127,6 @@ static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server } } zend_end_try(); - if (old_cwd[0] != '\0') { - php_ignore_value(VCWD_CHDIR(old_cwd)); - } - - free_alloca(old_cwd, use_heap); - return decline; } /* }}} */ @@ -2330,10 +2318,20 @@ static int php_cli_server_ctor(php_cli_server *server, const char *addr, const c if (router) { size_t router_len = strlen(router); - _router = pestrndup(router, router_len, 1); - if (!_router) { - retval = FAILURE; - goto out; + if (!IS_ABSOLUTE_PATH(router, router_len)) { + _router = pemalloc(server->document_root_len + router_len + 2, 1); + if (!_router) { + retval = FAILURE; + goto out; + } + snprintf(_router, + server->document_root_len + router_len + 2, "%s%c%s", server->document_root, DEFAULT_SLASH, router); + } else { + _router = pestrndup(router, router_len, 1); + if (!_router) { + retval = FAILURE; + goto out; + } } server->router = _router; server->router_len = router_len;

« previous php.cvs (#99741) next »