mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-06 01:51:51 +00:00
Code Issues Projects Releases Wiki Activity

TextFormat: properly handle pcre errors in some cases

Browse Source 
these would previously just hit type errors.
This commit is contained in:
Dylan K. Taylor 2020-04-15 11:29:04 +01:00
parent 2622c34542
commit 41d7b8c0e4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/utils/TextFormat.php
View File

@ -66,13 +66,19 @@ abstract class TextFormat{
public const ITALIC = TextFormat::ESCAPE . "o"; public const ITALIC = TextFormat::ESCAPE . "o";
public const RESET = TextFormat::ESCAPE . "r"; public const RESET = TextFormat::ESCAPE . "r";
private static function makePcreError(string $info) : \InvalidArgumentException{
throw new \InvalidArgumentException("$info: Encountered PCRE error " . preg_last_error() . " during regex operation");
}
/** /**
* Splits the string by Format tokens * Splits the string by Format tokens
* *
* @return string[] * @return string[]
*/ */
public static function tokenize(string $string) : array{ public static function tokenize(string $string) : array{
return preg_split("/(" . TextFormat::ESCAPE . "[0-9a-fk-or])/u", $string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE); $result = preg_split("/(" . TextFormat::ESCAPE . "[0-9a-fk-or])/u", $string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
if($result === false) throw self::makePcreError("Failed to tokenize string");
return $result;
} }
/** /**
@ -83,6 +89,7 @@ abstract class TextFormat{
public static function clean(string $string, bool $removeFormat = true) : string{ public static function clean(string $string, bool $removeFormat = true) : string{
$string = mb_scrub($string, 'UTF-8'); $string = mb_scrub($string, 'UTF-8');
$string = preg_replace("/[\x{E000}-\x{F8FF}]/u", "", $string); //remove unicode private-use-area characters (they might break the console) $string = preg_replace("/[\x{E000}-\x{F8FF}]/u", "", $string); //remove unicode private-use-area characters (they might break the console)
if($string === null) throw self::makePcreError("Failed to strip private-area characters");
if($removeFormat){ if($removeFormat){
$string = str_replace(TextFormat::ESCAPE, "", preg_replace("/" . TextFormat::ESCAPE . "[0-9a-fk-or]/u", "", $string)); $string = str_replace(TextFormat::ESCAPE, "", preg_replace("/" . TextFormat::ESCAPE . "[0-9a-fk-or]/u", "", $string));
} }