From d35cb9cdee586a9668ca1d9a72ffdb4f0902b2ba Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Mon, 13 Apr 2020 21:00:44 -0700
Subject: [PATCH] Fix bug #79330 - make all execution modes consistent in
 rejecting \0

(cherry picked from commit 14fcc813948254b84f382ff537247d8a7e5e0e62)
---
 ext/standard/exec.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index d6f0cbfeb2..e486f52a3d 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -524,6 +524,15 @@ PHP_FUNCTION(shell_exec)
 		return;
 	}
 
+	if (!command_len) {
+		php_error_docref(NULL, E_WARNING, "Cannot execute a blank command");
+		RETURN_FALSE;
+	}
+	if (strlen(command) != command_len) {
+		php_error_docref(NULL, E_WARNING, "NULL byte detected. Possible attack");
+		RETURN_FALSE;
+	}
+
 #ifdef PHP_WIN32
 	if ((in=VCWD_POPEN(command, "rt"))==NULL) {
 #else