From dd2ffaab2c3a38f82afdf5564c008ee48aa53bed Mon Sep 17 00:00:00 2001
From: David CARLIER <devnexen@gmail.com>
Date: Sun, 7 Apr 2024 16:43:36 +0100
Subject: [PATCH] ext/pcntl: pcntl affinity improves EINVAL handling in both
 cases. (#13907)

also disable tests on travis.
---
 ext/pcntl/pcntl.c                      | 6 ++++++
 ext/pcntl/tests/pcntl_cpuaffinity.phpt | 1 +
 2 files changed, 7 insertions(+)

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 891619afc60..69b3b1f19ac 100644
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -1516,6 +1516,9 @@ PHP_FUNCTION(pcntl_getcpuaffinity)
 			case EPERM:
 				php_error_docref(NULL, E_WARNING, "Calling process not having the proper privileges");
 				break;
+			case EINVAL:
+				zend_value_error("invalid cpu affinity mask size");
+				RETURN_THROWS();
 			default:
 				php_error_docref(NULL, E_WARNING, "Error %d", errno);
 		}
@@ -1597,6 +1600,9 @@ PHP_FUNCTION(pcntl_setcpuaffinity)
 			case EPERM:
 				php_error_docref(NULL, E_WARNING, "Calling process not having the proper privileges");
 				break;
+			case EINVAL:
+				zend_argument_value_error(2, "invalid cpu affinity mask size or unmapped cpu id(s)");
+				RETURN_THROWS();
 			default:
 				php_error_docref(NULL, E_WARNING, "Error %d", errno);
 		}
diff --git a/ext/pcntl/tests/pcntl_cpuaffinity.phpt b/ext/pcntl/tests/pcntl_cpuaffinity.phpt
index 6dc3399e161..caeb27d2759 100644
--- a/ext/pcntl/tests/pcntl_cpuaffinity.phpt
+++ b/ext/pcntl/tests/pcntl_cpuaffinity.phpt
@@ -5,6 +5,7 @@ pcntl
 --SKIPIF--
 <?php
 if (!function_exists("pcntl_setcpuaffinity")) die("skip pcntl_setcpuaffinity is not available");
+if (getenv('TRAVIS')) die('skip Currently fails on Travis');
 ?>
 --FILE--
 <?php