From 0bc4cf901c7069f5554812b629da6be481ccd4a2 Mon Sep 17 00:00:00 2001 From: Anatol Belski <ab@php.net> Date: Sat, 17 Feb 2018 02:07:23 +0100 Subject: [PATCH] Fix unsigned comparisons --- ext/mbstring/mb_gpc.c | 2 +- ext/mbstring/mbstring.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index 0cb06b8f6c..582a29f865 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -261,7 +261,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i num = n; /* make sure to process initialized vars only */ /* initialize converter */ - if (info->num_from_encodings <= 0) { + if (info->num_from_encodings == 0) { from_encoding = &mbfl_encoding_pass; } else if (info->num_from_encodings == 1) { from_encoding = info->from_encodings[0]; diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 0fb57b0165..5f11a510aa 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -724,7 +724,7 @@ php_mb_parse_encoding_list(const char *value, size_t value_length, const mbfl_en const mbfl_encoding **entry, **list; list = NULL; - if (value == NULL || value_length <= 0) { + if (value == NULL || value_length == 0) { if (return_list) { *return_list = NULL; } @@ -3401,7 +3401,7 @@ PHP_FUNCTION(mb_detect_encoding) } break; } - if (size <= 0) { + if (size == 0) { php_error_docref(NULL, E_WARNING, "Illegal argument"); } } @@ -3810,7 +3810,7 @@ PHP_FUNCTION(mb_convert_variables) break; } - if (elistsz <= 0) { + if (elistsz == 0) { from_encoding = &mbfl_encoding_pass; } else if (elistsz == 1) { from_encoding = *elist; -- 2.40.0