From 978f214caa0b9a8d094690ee9c463d446ae779c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Wed, 4 May 2022 14:16:54 +0200
Subject: [PATCH 1/5] Fix tests on 32-bit Windows OS

---
 ext/gd/tests/bug77269.phpt       | 18 ------------------
 ext/gd/tests/bug77272.phpt       |  1 +
 ext/sysvshm/tests/bug72858.phpt  |  4 ++--
 sapi/phpdbg/tests/watch_001.phpt |  3 ---
 sapi/phpdbg/tests/watch_002.phpt |  3 ---
 sapi/phpdbg/tests/watch_003.phpt |  3 ---
 sapi/phpdbg/tests/watch_004.phpt |  3 ---
 7 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 ext/gd/tests/bug77269.phpt

diff --git a/ext/gd/tests/bug77269.phpt b/ext/gd/tests/bug77269.phpt
deleted file mode 100644
index 2bd5758e1a903..0000000000000
--- a/ext/gd/tests/bug77269.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Bug #77269 (Potential unsigned underflow in gdImageScale)
---SKIPIF--
-<?php
-if (!extension_loaded('gd')) die('skip gd extension not available');
-if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-?>
---INI--
-memory_limit=2G
---FILE--
-<?php
-$im = imagecreate(2**28, 1);
-imagescale($im, 1, 1, IMG_TRIANGLE);
-
-?>
---EXPECTF--
-Warning: imagescale():%S Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
- in %s on line %d
diff --git a/ext/gd/tests/bug77272.phpt b/ext/gd/tests/bug77272.phpt
index 678333f06c0eb..e5cf816f78264 100644
--- a/ext/gd/tests/bug77272.phpt
+++ b/ext/gd/tests/bug77272.phpt
@@ -5,6 +5,7 @@ memory_limit=-1
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) die('skip gd extension not available');
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstream fix not yet released');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
diff --git a/ext/sysvshm/tests/bug72858.phpt b/ext/sysvshm/tests/bug72858.phpt
index efa72edb5b1e0..8daf69936d032 100644
--- a/ext/sysvshm/tests/bug72858.phpt
+++ b/ext/sysvshm/tests/bug72858.phpt
@@ -3,7 +3,6 @@ Bug #72858 shm_attach null dereference
 --SKIPIF--
 <?php
 if (!extension_loaded("sysvshm")){ print 'skip'; }
-if (4 < PHP_INT_SIZE) { print "skip 32-bit only"; }
 if (substr(PHP_OS, 0, 3) != "WIN") { print "skip windows only"; }
 ?>
 --FILE--
@@ -14,5 +13,6 @@ $v2=0xffffffff / 4 + 0x1337;
 shm_attach($v1,$v2);
 
 ?>
+==DONE==
 --EXPECTF--
-Warning: shm_attach(): Failed for key 0x64: Not enough space in %s on line %d
+==DONE==
diff --git a/sapi/phpdbg/tests/watch_001.phpt b/sapi/phpdbg/tests/watch_001.phpt
index 90ede3f9524ff..0a3d6e6c0e317 100644
--- a/sapi/phpdbg/tests/watch_001.phpt
+++ b/sapi/phpdbg/tests/watch_001.phpt
@@ -2,9 +2,6 @@
 Test simple recursive watchpoint
 --SKIPIF--
 <?php
-if (PHP_INT_SIZE == 4) {
-    die("xfail There may be flaws in the implementation of watchpoints that cause failures");
-}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }
diff --git a/sapi/phpdbg/tests/watch_002.phpt b/sapi/phpdbg/tests/watch_002.phpt
index ba2cad1abee60..c59787141c5e5 100644
--- a/sapi/phpdbg/tests/watch_002.phpt
+++ b/sapi/phpdbg/tests/watch_002.phpt
@@ -2,9 +2,6 @@
 Test simple array watchpoint with replace
 --SKIPIF--
 <?php
-if (PHP_INT_SIZE == 4) {
-    die("xfail There may be flaws in the implementation of watchpoints that cause failures");
-}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }
diff --git a/sapi/phpdbg/tests/watch_003.phpt b/sapi/phpdbg/tests/watch_003.phpt
index ab6dc317a87b4..96d03d2f3c98b 100644
--- a/sapi/phpdbg/tests/watch_003.phpt
+++ b/sapi/phpdbg/tests/watch_003.phpt
@@ -2,9 +2,6 @@
 Test simple watchpoint with replace
 --SKIPIF--
 <?php
-if (PHP_INT_SIZE == 4) {
-    die("xfail There may be flaws in the implementation of watchpoints that cause failures");
-}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }
diff --git a/sapi/phpdbg/tests/watch_004.phpt b/sapi/phpdbg/tests/watch_004.phpt
index 42e3fd3b2686c..10ec8ffa61fab 100644
--- a/sapi/phpdbg/tests/watch_004.phpt
+++ b/sapi/phpdbg/tests/watch_004.phpt
@@ -2,9 +2,6 @@
 Test detection of inline string manipulations on zval watch
 --SKIPIF--
 <?php
-if (PHP_INT_SIZE == 4) {
-    die("xfail There may be flaws in the implementation of watchpoints that cause failures");
-}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }

From c344d3042f8c7a98b46be35d47deca8f706d15d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Mon, 16 May 2022 18:15:03 +0200
Subject: [PATCH 2/5] rm xfail for master only

---
 sapi/phpdbg/tests/watch_001.phpt | 3 +++
 sapi/phpdbg/tests/watch_002.phpt | 3 +++
 sapi/phpdbg/tests/watch_003.phpt | 3 +++
 sapi/phpdbg/tests/watch_004.phpt | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/sapi/phpdbg/tests/watch_001.phpt b/sapi/phpdbg/tests/watch_001.phpt
index 0a3d6e6c0e317..90ede3f9524ff 100644
--- a/sapi/phpdbg/tests/watch_001.phpt
+++ b/sapi/phpdbg/tests/watch_001.phpt
@@ -2,6 +2,9 @@
 Test simple recursive watchpoint
 --SKIPIF--
 <?php
+if (PHP_INT_SIZE == 4) {
+    die("xfail There may be flaws in the implementation of watchpoints that cause failures");
+}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }
diff --git a/sapi/phpdbg/tests/watch_002.phpt b/sapi/phpdbg/tests/watch_002.phpt
index c59787141c5e5..ba2cad1abee60 100644
--- a/sapi/phpdbg/tests/watch_002.phpt
+++ b/sapi/phpdbg/tests/watch_002.phpt
@@ -2,6 +2,9 @@
 Test simple array watchpoint with replace
 --SKIPIF--
 <?php
+if (PHP_INT_SIZE == 4) {
+    die("xfail There may be flaws in the implementation of watchpoints that cause failures");
+}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }
diff --git a/sapi/phpdbg/tests/watch_003.phpt b/sapi/phpdbg/tests/watch_003.phpt
index 96d03d2f3c98b..ab6dc317a87b4 100644
--- a/sapi/phpdbg/tests/watch_003.phpt
+++ b/sapi/phpdbg/tests/watch_003.phpt
@@ -2,6 +2,9 @@
 Test simple watchpoint with replace
 --SKIPIF--
 <?php
+if (PHP_INT_SIZE == 4) {
+    die("xfail There may be flaws in the implementation of watchpoints that cause failures");
+}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }
diff --git a/sapi/phpdbg/tests/watch_004.phpt b/sapi/phpdbg/tests/watch_004.phpt
index 10ec8ffa61fab..42e3fd3b2686c 100644
--- a/sapi/phpdbg/tests/watch_004.phpt
+++ b/sapi/phpdbg/tests/watch_004.phpt
@@ -2,6 +2,9 @@
 Test detection of inline string manipulations on zval watch
 --SKIPIF--
 <?php
+if (PHP_INT_SIZE == 4) {
+    die("xfail There may be flaws in the implementation of watchpoints that cause failures");
+}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }

From 91dca4f3885fb5675960c781fc433fca578afa77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Thu, 26 May 2022 23:16:39 +0200
Subject: [PATCH 3/5] Delete bug72858.phpt

---
 ext/sysvshm/tests/bug72858.phpt | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 ext/sysvshm/tests/bug72858.phpt

diff --git a/ext/sysvshm/tests/bug72858.phpt b/ext/sysvshm/tests/bug72858.phpt
deleted file mode 100644
index 8daf69936d032..0000000000000
--- a/ext/sysvshm/tests/bug72858.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Bug #72858 shm_attach null dereference
---SKIPIF--
-<?php
-if (!extension_loaded("sysvshm")){ print 'skip'; }
-if (substr(PHP_OS, 0, 3) != "WIN") { print "skip windows only"; }
-?>
---FILE--
-<?php
-
-$v1=100;
-$v2=0xffffffff / 4 + 0x1337;
-shm_attach($v1,$v2);
-
-?>
-==DONE==
---EXPECTF--
-==DONE==

From 36304a3de37dd348e9fa9d1c8aff2d3dbcd21855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Thu, 26 May 2022 23:16:39 +0200
Subject: [PATCH 4/5] Revert "Delete bug72858.phpt"

This reverts commit 91dca4f3885fb5675960c781fc433fca578afa77.
---
 ext/sysvshm/tests/bug72858.phpt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 ext/sysvshm/tests/bug72858.phpt

diff --git a/ext/sysvshm/tests/bug72858.phpt b/ext/sysvshm/tests/bug72858.phpt
new file mode 100644
index 0000000000000..8daf69936d032
--- /dev/null
+++ b/ext/sysvshm/tests/bug72858.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug #72858 shm_attach null dereference
+--SKIPIF--
+<?php
+if (!extension_loaded("sysvshm")){ print 'skip'; }
+if (substr(PHP_OS, 0, 3) != "WIN") { print "skip windows only"; }
+?>
+--FILE--
+<?php
+
+$v1=100;
+$v2=0xffffffff / 4 + 0x1337;
+shm_attach($v1,$v2);
+
+?>
+==DONE==
+--EXPECTF--
+==DONE==

From 80f22ab974c73f7a4d74c87359c70a3e26f8dac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Fri, 27 May 2022 16:30:21 +0200
Subject: [PATCH 5/5] test shm_attach /w PHP_INT_MAX

---
 ext/sysvshm/tests/bug72858.phpt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ext/sysvshm/tests/bug72858.phpt b/ext/sysvshm/tests/bug72858.phpt
index 8daf69936d032..905eb49c8f4d1 100644
--- a/ext/sysvshm/tests/bug72858.phpt
+++ b/ext/sysvshm/tests/bug72858.phpt
@@ -8,11 +8,10 @@ if (substr(PHP_OS, 0, 3) != "WIN") { print "skip windows only"; }
 --FILE--
 <?php
 
-$v1=100;
-$v2=0xffffffff / 4 + 0x1337;
-shm_attach($v1,$v2);
+$v1 = 100;
+$v2 = PHP_INT_MAX;
+shm_attach($v1, $v2);
 
 ?>
-==DONE==
 --EXPECTF--
-==DONE==
+Warning: shm_attach(): Failed for key 0x64: No error in %s on line %d