From: Stanislav Malyshev <stas@php.net>
Date: Thu, 28 Mar 2019 07:37:36 +0000 (-0700)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.5RC1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66c35b083b1f3e3c9a95e4af5e8e4c14b05f2fe7;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Validate subject encoding in mb_split and mb_ereg_match
  Validate pattern against mbregex encoding
  SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
---

66c35b083b1f3e3c9a95e4af5e8e4c14b05f2fe7
diff --cc ext/mbstring/tests/bug72994.phpt
index 842fdc10b6,d001fac679..14f590bdb7
--- a/ext/mbstring/tests/bug72994.phpt
+++ b/ext/mbstring/tests/bug72994.phpt
@@@ -14,6 -14,6 +14,6 @@@ var_dump($var1)
  --EXPECTF--
  Notice: Undefined variable: var in %s on line %d
  
- Warning: mb_ereg_replace(): mbregex compile err: invalid code point value in %sbug72994.php on line %d
 -Warning: mbereg_replace(): Pattern is not valid under UTF-8 encoding in %s on line %d
++Warning: mb_ereg_replace(): Pattern is not valid under UTF-8 encoding in %sbug72994.php on line %d
  bool(false)
  ===DONE===
diff --cc ext/mbstring/tests/bug77367.phpt
index 0ba76fd23c,0000000000..76c0a9568f
mode 100644,000000..100644
--- a/ext/mbstring/tests/bug77367.phpt
+++ b/ext/mbstring/tests/bug77367.phpt
@@@ -1,21 -1,0 +1,16 @@@
 +--TEST--
 +Bug #77367 (Negative size parameter in mb_split)
 +--SKIPIF--
 +<?php
 +if (!extension_loaded('mbstring')) die('mbstring extension not available');
 +if (!function_exists('mb_split')) die('mb_split() not available');
 +?>
 +--FILE--
 +<?php
 +mb_regex_encoding('UTF-8');
 +var_dump(mb_split("\\w", "\xfc"));
 +?>
 +===DONE===
 +--EXPECT--
- array(2) {
-   [0]=>
-   string(0) ""
-   [1]=>
-   string(0) ""
- }
++bool(false)
 +===DONE===