diff options
| author | Adam Harvey <aharvey@php.net> | 2015-01-06 01:23:27 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2015-01-06 01:23:27 +0000 |
| commit | 448ef30f75988384b84cdb88bbb3a1a56b9534da (patch) | |
| tree | 52c00fc2c4a955775877e217390b5b01a48faa3b /sapi/cli/php_cli_server.c | |
| parent | 0cc2810498a56e263f2e1dd77f1f42e6c53dc99e (diff) | |
| download | php-git-448ef30f75988384b84cdb88bbb3a1a56b9534da.tar.gz | |
Handle NULL strings in sapi_cli_server_register_variable().
Fixes bug #68745 (Invalid HTTP requests make web server segfault).
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 5 |
1 files changed, 5 insertions, 0 deletions
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); } |