diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-04 23:24:04 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-08-04 23:24:04 +0200 |
| commit | 70ecb6e50b983419f6a2d5e028f9779354047ec1 (patch) | |
| tree | c5f39fc547292eddf84f8d1122ea811b2e65e8bb | |
| parent | 99020cc085063819ab6cecb5a4594b90d0ec6e7f (diff) | |
| download | php-git-70ecb6e50b983419f6a2d5e028f9779354047ec1.tar.gz | |
Fix #76706: mbstring.http_output_conv_mimetypes is ignored
_php_mb_match_regex() is supposed to return != 0 on success, and 0 on
failure. pcre2_match() returns >= 0 on success, and < 0 on failure.
We map the result accordingly.
Since this patch fixes four failing tests, there is no need to add
another.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -5,6 +5,7 @@ PHP NEWS - mbstring: . Fixed bug #76704 (mb_detect_order return value varies based on argument type). (cmb) + . Fixed bug #76706 (mbstring.http_output_conv_mimetypes is ignored). (cmb) - phpdbg: . Fixed bug #76595 (phpdbg man page contains outdated information). diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index bb464d0008..cdecd99385 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1068,7 +1068,7 @@ static int _php_mb_match_regex(void *opaque, const char *str, size_t str_len) php_error_docref(NULL, E_WARNING, "Cannot allocate match data"); return FAILURE; } - res = pcre2_match(opaque, (PCRE2_SPTR)str, str_len, 0, 0, match_data, php_pcre_mctx()); + res = pcre2_match(opaque, (PCRE2_SPTR)str, str_len, 0, 0, match_data, php_pcre_mctx()) >= 0; php_pcre_free_match_data(match_data); return res; |