com php-src: Fix php cli (-S option) inconsistent port parsing: sapi/cli/php_cli_server.c

From: Date: Mon, 01 Dec 2014 06:42:12 +0000
Subject: com php-src: Fix php cli (-S option) inconsistent port parsing: sapi/cli/php_cli_server.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83447@lists.php.net to get a copy of this message
Commit: 2a73d56ef9e1a4ca8cbc9521e98c64a3716bbb4c Author: nil0x42 <nil0x42@users.noreply.github.com> Fri, 11 Jul 2014 19:48:03 +0200 Committer: Stanislav Malyshev <stas@php.net> Sun, 30 Nov 2014 22:42:12 -0800 Parents: cb1a297bf48bd1ef1183b25f046659aaf376688a Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2a73d56ef9e1a4ca8cbc9521e98c64a3716bbb4c Log: Fix php cli (-S option) inconsistent port parsing Add port range verification of listening port with -S option for the php cli. This fixes inconsistent listening port due to unverified cast from long to short with htons(3). Changed paths: M sapi/cli/php_cli_server.c Diff: diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index f333add...f7f1c2b 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2256,7 +2256,7 @@ static int php_cli_server_ctor(php_cli_server *server, const char *addr, const c *p++ = '\0'; if (*p == ':') { port = strtol(p + 1, &p, 10); - if (port <= 0) { + if (port <= 0 || port > 65535) { p = NULL; } } else if (*p != '\0') { @@ -2272,7 +2272,7 @@ static int php_cli_server_ctor(php_cli_server *server, const char *addr, const c if (p) { *p++ = '\0'; port = strtol(p, &p, 10); - if (port <= 0) { + if (port <= 0 || port > 65535) { p = NULL; } }

« previous php.cvs (#83447) next »