From f41886a5e2ef9c3066f280343307080c51001f25 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Wed, 3 Jan 2024 20:13:51 +0100
Subject: [PATCH] Fix failing 32-bit mbstring tests

---
 ext/mbstring/tests/euc_tw_encoding.phpt       | 1 +
 ext/mbstring/tests/gb18030_2022_encoding.phpt | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/mbstring/tests/euc_tw_encoding.phpt b/ext/mbstring/tests/euc_tw_encoding.phpt
index 720c279d2c47b..6288735c1f1dc 100644
--- a/ext/mbstring/tests/euc_tw_encoding.phpt
+++ b/ext/mbstring/tests/euc_tw_encoding.phpt
@@ -5,6 +5,7 @@ mbstring
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+if (PHP_INT_SIZE == 4 && !extension_loaded("ctype")) die("skip needs ctype extension on 32-bit");
 ?>
 --FILE--
 <?php
diff --git a/ext/mbstring/tests/gb18030_2022_encoding.phpt b/ext/mbstring/tests/gb18030_2022_encoding.phpt
index 4ddb463cbf451..6908e4fed75b6 100644
--- a/ext/mbstring/tests/gb18030_2022_encoding.phpt
+++ b/ext/mbstring/tests/gb18030_2022_encoding.phpt
@@ -5,6 +5,7 @@ mbstring
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+if (PHP_INT_SIZE == 4 && !extension_loaded("ctype")) die("skip needs ctype extension on 32-bit");
 ?>
 --FILE--
 <?php
@@ -211,7 +212,7 @@ function readGB18030_2022_ConversionTable($path, &$from, &$to, $utf32 = false) {
                 // We may be on a 32-bit machine and testing a text encoding with 4-byte codes
                 // (which can't be represented in a PHP integer)
                 $char = "";
-                for ($i = 2; $i < strlen($line); $i += 2) {
+                for ($i = strpos($line, "\t") + 1; $i < strlen($line); $i += 2) {
                     $substr = substr($line, $i, 2);
                     if (ctype_xdigit($substr))
                         $char .= chr(hexdec($substr));