fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 16:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix null return value when regexp replace fails on invalid input

Browse source
This commit is contained in:
Kijin Sung 2025-09-20 11:34:54 +09:00
parent dcd84033cf
commit 16b6544f9d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/functions.php
View file

@ -671,7 +671,7 @@ function utf8_mbencode($str): string
$bytes = array(ord($m[0][0]), ord($m[0][1]), ord($m[0][2]), ord($m[0][3])); $bytes = array(ord($m[0][0]), ord($m[0][1]), ord($m[0][2]), ord($m[0][3]));
$codepoint = ((0x07 & $bytes[0]) << 18) + ((0x3F & $bytes[1]) << 12) + ((0x3F & $bytes[2]) << 6) + (0x3F & $bytes[3]); $codepoint = ((0x07 & $bytes[0]) << 18) + ((0x3F & $bytes[1]) << 12) + ((0x3F & $bytes[2]) << 6) + (0x3F & $bytes[3]);
return '&#x' . dechex($codepoint) . ';'; return '&#x' . dechex($codepoint) . ';';
}, (string)$str); }, (string)$str) ?? '';
} }
/** /**
@ -686,11 +686,11 @@ function utf8_normalize_spaces($str, bool $multiline = false): string
{ {
if ($multiline) if ($multiline)
{ {
return preg_replace(['/((?!\x0A)[\pZ\pC])+/u', '/\x20*\x0A\x20*/'], [' ', "\n"], (string)$str); return preg_replace(['/((?!\x0A)[\pZ\pC])+/u', '/\x20*\x0A\x20*/'], [' ', "\n"], (string)$str) ?? '';
} }
else else
{ {
return preg_replace('/[\pZ\pC]+/u', ' ', (string)$str); return preg_replace('/[\pZ\pC]+/u', ' ', (string)$str) ?? '';
} }
} }