From 70ecb6e50b983419f6a2d5e028f9779354047ec1 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sat, 4 Aug 2018 23:24:04 +0200 Subject: 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. --- ext/mbstring/mbstring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mbstring/mbstring.c') 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; -- cgit v1.2.1