Prepare 7.3.10

We backport kkos/oniguruma@d3e402928b.

(cherry picked from commit 8f949eba80)

NEWS

@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 7.3.10
+26 Sep 2019, PHP 7.3.10
 
 - Core:
   . Fixed bug #78220 (Can't access OneDrive folder). (cmb, ab)
@@ -23,6 +23,9 @@ PHP                                                                        NEWS
   . Ensure IDNA2003 rules are used with idn_to_ascii() and idn_to_utf8()
     when requested. (Sara)
 
+- MBString:
+  . Fixed bug #78559 (Heap buffer overflow in mb_eregi). (cmb)
+
 - MySQLnd:
   . Fixed connect_attr issues and added the _server_host connection attribute.
     (Qianqian Bu)

Zend/zend.h

@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "3.3.10-dev"
+#define ZEND_VERSION "3.3.10"
 
 #define ZEND_ENGINE_3
 

configure.ac

@@ -108,7 +108,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=7
 PHP_MINOR_VERSION=3
 PHP_RELEASE_VERSION=10
-PHP_EXTRA_VERSION="-dev"
+PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
 

ext/intl/idn/idn.c

@@ -232,7 +232,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS,
 #if defined(__clang__)
 # pragma clang diagnostic push
 # pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif ZEND_GCC_VERSION >= 4002
+#elif ZEND_GCC_VERSION >= 4008
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
@@ -243,7 +243,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS,
 		}
 #if defined(__clang__)
 # pragma clang diagnostic pop
-#elif ZEND_GCC_VERSION >= 4002
+#elif ZEND_GCC_VERSION >= 4008
 # pragma GCC diagnostic pop
 #endif
 		efree(ustring);

ext/mbstring/oniguruma/src/regexec.c

@@ -4196,6 +4196,7 @@ str_lower_case_match(OnigEncoding enc, int case_fold_flag,
     lowlen = ONIGENC_MBC_CASE_FOLD(enc, case_fold_flag, &p, end, lowbuf);
     q = lowbuf;
     while (lowlen > 0) {
+      if (t >= tend)    return 0;
       if (*t++ != *q++) return 0;
       lowlen--;
     }

ext/mbstring/tests/bug78559.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Bug #78559 (#78559	Heap buffer overflow in mb_eregi)
+--SKIPIF--
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+if (!function_exists('mb_ereg')) die('skip mb_ereg() not available');
+?>
+--FILE--
+<?php
+$str = "5b5b5b5b5b5b5b492a5bce946b5c4b5d5c6b5c4b5d5c4b5d1cceb04b5d1cceb07a73717e4b1c52525252525252525252525252525252525252525252525252492a5bce946b5c4b5d5c6b5c4b5d5c4b5d1cceb04b5d1cceb07a73717e4b1c1cceb04b5d1cceb07a73717e4b1c302c36303030ceb07b7bd2a15c305c30663f436f6e74655c5238416711087b363030302c36303030ceb07b7b7b7b7b7b7b363030302c36303030ceb07b7b7b7b7b7b7b4a01";
+$str = hex2bin($str);
+var_dump(mb_eregi($str, $str));
+?>
+--EXPECT--
+bool(false)

main/php_version.h

@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 10
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "7.3.10-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "7.3.10"
 #define PHP_VERSION_ID 70310