Skip to content

Commit 1c753a9

Browse files
committed
Pre-compute remote address length in CLI SAPI
1 parent b37245b commit 1c753a9

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

sapi/cli/php_cli_server.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -671,10 +671,12 @@ static void sapi_cli_server_register_variables(zval *track_vars_array) /* {{{ */
671671

672672
strncpy(port, tmp + 1, 8);
673673
port[7] = '\0';
674-
strncpy(addr, addr_start, addr_end - addr_start);
675-
addr[addr_end - addr_start] = '\0';
674+
size_t addr_len = addr_end - addr_start;
675+
strncpy(addr, addr_start, addr_len);
676+
addr[addr_len] = '\0';
677+
ZEND_ASSERT(addr_len == strlen(addr));
676678
sapi_cli_server_register_known_var_char(track_vars_array,
677-
"REMOTE_ADDR", strlen("REMOTE_ADDR"), addr, strlen(addr));
679+
"REMOTE_ADDR", strlen("REMOTE_ADDR"), addr, addr_len);
678680
sapi_cli_server_register_known_var_char(track_vars_array,
679681
"REMOTE_PORT", strlen("REMOTE_PORT"), port, strlen(port));
680682
} else {

0 commit comments

Comments
 (0)