diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-14 18:39:14 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-14 18:39:14 +0000 |
| commit | b9ad0002f5fc40f5808f85119a67012c2e9a4141 (patch) | |
| tree | 5dc09ca330b2358670215ff9cdbf6f3bfdcbd6e4 /sapi/apache2handler/php_functions.c | |
| parent | 0bfa245aa3f3994d3095afd696bbd3f0130594ab (diff) | |
| parent | 855d2966385755435b65d77e1c0dfda17555eab9 (diff) | |
| download | php-git-b9ad0002f5fc40f5808f85119a67012c2e9a4141.tar.gz | |
Merge branch 'master' into jsond
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index d9ae4d97ea..d038f9e9b9 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -288,8 +288,8 @@ PHP_FUNCTION(apache_setenv) PHP_FUNCTION(apache_getenv) { php_struct *ctx; - char *variable=NULL; - int variable_len; + char *variable; + size_t variable_len; zend_bool walk_to_top = 0; int arg_count = ZEND_NUM_ARGS(); char *env_val=NULL; @@ -388,8 +388,12 @@ PHP_MINFO_FUNCTION(apache) } smart_str_appendc(&tmp1, ' '); } - if (tmp1.s && (tmp1.s->len - 1) >= 0) { - tmp1.s->val[tmp1.s->len - 1] = '\0'; + if (tmp1.s) { + if (tmp1.s->len > 0) { + tmp1.s->val[tmp1.s->len - 1] = '\0'; + } else { + tmp1.s->val[0] = '\0'; + } } php_info_print_table_start(); |