From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 6 Aug 2020 19:53:13 +0000 (+0200)
Subject: Revert "Explicitly validate popen mode"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c8467562d4bc6f04047c0a32a91c95042f60f34;p=php

Revert "Explicitly validate popen mode"

This reverts commit ab36540bddb63139c3da9a9da5e5feacdf7bf7bf.

Causes a test failure on Windows.
---

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 88ffba8102..98578376b0 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -930,18 +930,10 @@ PHP_FUNCTION(popen)
 		char *z = memchr(posix_mode, 'b', mode_len);
 		if (z) {
 			memmove(z, z + 1, mode_len - (z - posix_mode));
-			mode_len--;
 		}
 	}
 #endif
 
-	/* Musl only partially validates the mode. Manually check it to ensure consistent behavior. */
-	if (mode_len != 1 || (*posix_mode != 'r' && *posix_mode != 'w')) {
-		php_error_docref2(NULL, command, posix_mode, E_WARNING, "Invalid mode");
-		efree(posix_mode);
-		RETURN_FALSE;
-	}
-
 	fp = VCWD_POPEN(command, posix_mode);
 	if (!fp) {
 		php_error_docref2(NULL, command, posix_mode, E_WARNING, "%s", strerror(errno));
diff --git a/ext/standard/tests/file/popen_pclose_error.phpt b/ext/standard/tests/file/popen_pclose_error.phpt
index 0713280870..2f05e7788d 100644
--- a/ext/standard/tests/file/popen_pclose_error.phpt
+++ b/ext/standard/tests/file/popen_pclose_error.phpt
@@ -22,7 +22,7 @@ unlink($file_path."/popen.tmp");
 --EXPECTF--
 *** Testing for error conditions ***
 
-Warning: popen(abc.txt,rw): Invalid mode in %s on line %d
+Warning: popen(abc.txt,rw): %s on line %d
 bool(false)
 
 --- Done ---