[Mbstring] fix mb_str_split() ignoring new-line characters

nicolas-grekas · nicolas-grekas · commit ed92f9e64b32 · 2020-01-13T12:02:47.000+01:00
diff --git a/Mbstring.php b/Mbstring.php
@@ -545,7 +545,14 @@ public static function mb_str_split($string, $split_length = 1, $encoding = null
         }
 
         if ('UTF-8' === $encoding = self::getEncoding($encoding)) {
-            return preg_split("/(.{{$split_length}})/u", $string, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+            $rx = '/(';
+            while (65535 < $split_length) {
+                $rx .= '.{65535}';
+                $split_length -= 65535;
+            }
+            $rx .= '.{'.$split_length.'})/us';
+
+            return preg_split($rx, $string, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
         }
 
         $result = array();

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,14 @@ public static function mb_str_split($string, $split_length = 1, $encoding = null`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`if ('UTF-8' === $encoding = self::getEncoding($encoding)) {`
`548`		`- return preg_split("/(.{{$split_length}})/u", $string, null, PREG_SPLIT_DELIM_CAPTURE \| PREG_SPLIT_NO_EMPTY);`
	`548`	`+ $rx = '/(';`
	`549`	`+ while (65535 < $split_length) {`
	`550`	`+ $rx .= '.{65535}';`
	`551`	`+ $split_length -= 65535;`
	`552`	`+ }`
	`553`	`+ $rx .= '.{'.$split_length.'})/us';`
	`554`	`+`
	`555`	`+ return preg_split($rx, $string, null, PREG_SPLIT_DELIM_CAPTURE \| PREG_SPLIT_NO_EMPTY);`
`549`	`556`	`}`
`550`	`557`
`551`	`558`	`$result = array();`