MFH: Fix return value of pcntl_wexitstatus() (fixes #47566,

patch by james at jamesreno dot com)

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index e5ce729b37fb24421051f01fe782493c413b020b..bee1693f1d8b843362b4d22814b96cf166b70414 100755 (executable)
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -607,9 +607,7 @@ PHP_FUNCTION(pcntl_wexitstatus)
               return;
        }
 
-       /* WEXITSTATUS only returns 8 bits so we *MUST* cast this to signed char
-          if you want to have valid negative exit codes */
-       RETURN_LONG((signed char) WEXITSTATUS(status_word));
+       RETURN_LONG(WEXITSTATUS(status_word));
 #else
        RETURN_FALSE;
 #endif

diff --git a/ext/pcntl/tests/001.phpt b/ext/pcntl/tests/001.phpt
index d83cae44686b25ec6fc770f3a6f0faacc59be048..fb1006e4bd126bd55ec1678bef676aff89cf27df 100644 (file)
--- a/ext/pcntl/tests/001.phpt
+++ b/ext/pcntl/tests/001.phpt
@@ -73,7 +73,7 @@ test_stop_signal();
 Staring wait.h tests....
 
 Testing pcntl_wifexited and wexitstatus....
-Exited With: -1
+Exited With: 255
 
 Testing pcntl_wifsignaled....
 Process was terminated by signal : SIGTERM

diff --git a/ext/pcntl/tests/bug47566.phpt b/ext/pcntl/tests/bug47566.phpt
new file mode 100644 (file)
index 0000000..8a69e6b
--- /dev/null
+++ b/ext/pcntl/tests/bug47566.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #47566 (return value of pcntl_wexitstatus())
+--SKIPIF--
+<?php if (!extension_loaded("pcntl")) print "skip"; ?>
+--FILE--
+<?
+$pid = pcntl_fork();
+if ($pid == -1) {
+ echo "Unable to fork";
+ exit;
+} elseif ($pid) {
+ $epid = pcntl_waitpid(-1,$status);
+ var_dump(pcntl_wexitstatus($status));
+} else {
+ exit(128);
+}
+?>
+--EXPECT--
+int(128)