com php-src: fix unsigned check: sapi/apache2handler/php_fu nctions.c

From: Date: Tue, 18 Nov 2014 12:19:48 +0000
Subject: com php-src: fix unsigned check: sapi/apache2handler/php_fu nctions.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83140@lists.php.net to get a copy of this message
Commit: 7c5ae9a1cf3e65afadb4ba3cf50a0690e7d4d27d Author: Anatol Belski <ab@php.net> Tue, 18 Nov 2014 11:03:54 +0100 Parents: 544a2c479254d104bb97641c819d733bd08ef968 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7c5ae9a1cf3e65afadb4ba3cf50a0690e7d4d27d Log: fix unsigned check Changed paths: M sapi/apache2handler/php_functions.c Diff: diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index d9ae4d9..f32c881 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -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();

« previous php.cvs (#83140) next »