summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--ext/standard/exec.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ec59791994..fdbd25bbe2 100644
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,7 @@
. Removed dl() function on fpm-fcgi. (Nikita)
. Removed support for hexadecimal numeric strings. (Nikita)
. Removed obsolete extensions and SAPIs. See the full list in UPGRADING. (Anatol)
+ . Added NULL byte protection to exec, system and passthru. (Yasuo)
- Curl:
. Fixed bug #68937 (Segfault in curl_multi_exec). (Laruence)
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index a727573735..a98751ef12 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -190,7 +190,7 @@ static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
RETURN_FALSE;
}
if (strlen(cmd) != cmd_len) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "NULL byte detected. Possible attack");
+ php_error_docref(NULL, E_WARNING, "NULL byte detected. Possible attack");
RETURN_FALSE;
}