EXEC

Author: Girgias

ext/standard/exec.c

@@ -220,12 +220,12 @@ static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (!cmd_len) {
-		php_error_docref(NULL, E_WARNING, "Cannot execute a blank command");
-		RETURN_FALSE;
+		zend_argument_value_error(1, "cannot be empty");
+		RETURN_THROWS();
 	}
 	if (strlen(cmd) != cmd_len) {
-		php_error_docref(NULL, E_WARNING, "NULL byte detected. Possible attack");
-		RETURN_FALSE;
+		zend_argument_type_error(1, "must not contain any null bytes");
+		RETURN_THROWS();
 	}
 
 	if (!ret_array) {
@@ -530,12 +530,12 @@ PHP_FUNCTION(shell_exec)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (!command_len) {
-		php_error_docref(NULL, E_WARNING, "Cannot execute a blank command");
-		RETURN_FALSE;
+		zend_argument_value_error(1, "cannot be empty");
+		RETURN_THROWS();
 	}
 	if (strlen(command) != command_len) {
-		php_error_docref(NULL, E_WARNING, "NULL byte detected. Possible attack");
-		RETURN_FALSE;
+		zend_argument_type_error(1, "must not contain any null bytes");
+		RETURN_THROWS();
 	}
 
 #ifdef PHP_WIN32

ext/standard/tests/misc/exec_basic1.phpt

@@ -8,18 +8,23 @@ exec, system, passthru  — Basic command execution functions
 --FILE--
 <?php
 $cmd = "echo abc\n\0command";
-var_dump(exec($cmd, $output));
-var_dump($output);
-var_dump(system($cmd));
-var_dump(passthru($cmd));
+try {
+    var_dump(exec($cmd, $output));
+} catch (\TypeError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+try {
+    var_dump(system($cmd, $output));
+} catch (\TypeError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+try {
+    var_dump(passthru($cmd, $output));
+} catch (\TypeError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 ?>
---EXPECTF--
-Warning: exec(): NULL byte detected. Possible attack in %s on line %d
-bool(false)
-NULL
-
-Warning: system(): NULL byte detected. Possible attack in %s on line %d
-bool(false)
-
-Warning: passthru(): NULL byte detected. Possible attack in %s on line %d
-bool(false)
+--EXPECT--
+exec(): Argument #1 ($command) must not contain any null bytes
+system(): Argument #1 ($command) must not contain any null bytes
+passthru(): Argument #1 ($command) must not contain any null bytes