From a4c08c1b0a471578b0d502732aceceb3f97b87cf Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 12 Feb 2024 19:14:25 +0000 Subject: [PATCH] Stricter string to integer conversion in TDF scripts --- .../TargetDescriptionFiles/Services/StringService.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/StringService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/StringService.php index 17be9613..7a5c5e94 100644 --- a/build/scripts/Targets/TargetDescriptionFiles/Services/StringService.php +++ b/build/scripts/Targets/TargetDescriptionFiles/Services/StringService.php @@ -9,7 +9,11 @@ class StringService return null; } - return stristr($value, '0x') !== false ? (int) hexdec($value) : (int) $value; + if (stripos($value, '0x') === 0) { + return ctype_xdigit(substr($value, 2)) ? (int) hexdec($value) : null; + } + + return ctype_digit($value) ? (int) $value : null; } public function tryIntToHex(?int $value, int $pad = 0): string