Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78853: preg_match() may return integer > 1

Author: cmb69

NEWS

@@ -18,6 +18,9 @@ PHP                                                                        NEWS
   . Fixed $x = (bool)$x; with opcache (should emit undeclared variable notice).
     (Tyson Andre)
 
+- PCRE:
+  . Fixed bug #78853 (preg_match() may return integer > 1). (cmb)
+
 ?? ??? ????, PHP 7.4.0RC6
 
 - Core:

ext/pcre/php_pcre.c

@@ -1359,7 +1359,11 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, zend_string *subject_str,
 				count = pcre2_match(pce->re, (PCRE2_SPTR)subject, subject_len, start_offset2,
 					PCRE2_NO_UTF_CHECK | PCRE2_NOTEMPTY_ATSTART | PCRE2_ANCHORED, match_data, mctx);
 				if (count >= 0) {
-					goto matched;
+					if (global) {
+						goto matched;
+					} else {
+						break;
+					}
 				} else if (count == PCRE2_ERROR_NOMATCH) {
 					/* If we previously set PCRE2_NOTEMPTY_ATSTART after a null match,
 					   this is not necessarily the end. We need to advance

ext/pcre/tests/bug78853.phpt

@@ -0,0 +1,8 @@
+--TEST--
+Bug #78853 (preg_match() may return integer > 1)
+--FILE--
+<?php
+var_dump(preg_match('/^|\d{1,2}$/', "7"));
+?>
+--EXPECT--
+int(1)