diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-04 13:49:29 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-04 13:50:48 +0200 |
| commit | 5dc74d9e708bf52b2d7303a61cd3b35e0e57aa94 (patch) | |
| tree | 85935f49ff45e4ab2a7203eda68aff96d946838e /ext/mbstring/mbstring.c | |
| parent | 81ebe930f32102136b30f23167561b08e646518b (diff) | |
| parent | db8bcdba80530e68808ca588f6bfea79957dc80e (diff) | |
| download | php-git-5dc74d9e708bf52b2d7303a61cd3b35e0e57aa94.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #76704: mb_detect_order return value varies based on argument type
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index eceafdd29c..bb464d0008 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -709,7 +709,7 @@ static const mbfl_encoding *php_mb_get_encoding(const char *encoding_name) { } /* {{{ static int php_mb_parse_encoding_list() - * Return 0 if input contains any illegal encoding, otherwise 1. + * Return FAILURE if input contains any illegal encoding, otherwise SUCCESS. * Even if any illegal encoding is detected the result may contain a list * of parsed encodings. */ @@ -786,7 +786,7 @@ php_mb_parse_encoding_list(const char *value, size_t value_length, const mbfl_en *entry++ = encoding; n++; } else { - ret = 0; + ret = FAILURE; } } p1 = p2 + 1; @@ -802,7 +802,7 @@ php_mb_parse_encoding_list(const char *value, size_t value_length, const mbfl_en if (return_list) { *return_list = NULL; } - ret = 0; + ret = FAILURE; } if (return_size) { *return_size = n; @@ -815,7 +815,7 @@ php_mb_parse_encoding_list(const char *value, size_t value_length, const mbfl_en /* }}} */ /* {{{ static int php_mb_parse_encoding_array() - * Return 0 if input contains any illegal encoding, otherwise 1. + * Return FAILURE if input contains any illegal encoding, otherwise SUCCESS. * Even if any illegal encoding is detected the result may contain a list * of parsed encodings. */ |