From 448ef30f75988384b84cdb88bbb3a1a56b9534da Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Tue, 6 Jan 2015 01:23:27 +0000 Subject: Handle NULL strings in sapi_cli_server_register_variable(). Fixes bug #68745 (Invalid HTTP requests make web server segfault). --- sapi/cli/php_cli_server.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sapi/cli/php_cli_server.c') diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 5e38fa53d3..5bfadf16c4 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -708,6 +708,11 @@ static void sapi_cli_server_register_variable(zval *track_vars_array, const char { char *new_val = (char *)val; uint new_val_len; + + if (NULL == val) { + return; + } + if (sapi_module.input_filter(PARSE_SERVER, (char*)key, &new_val, strlen(val), &new_val_len TSRMLS_CC)) { php_register_variable_safe((char *)key, new_val, new_val_len, track_vars_array TSRMLS_CC); } -- cgit v1.2.1