summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2011-06-23 21:48:15 +0000
committerFelipe Pena <felipe@php.net>2011-06-23 21:48:15 +0000
commit08ddf683fc5d4d6e10590e93a766ce31d45ab7ed (patch)
tree76760412359c1790163669a230e73c3689e6b8a2
parent71a5c3d7ec781bd058828a435b2dc8dfca973472 (diff)
downloadphp-git-08ddf683fc5d4d6e10590e93a766ce31d45ab7ed.tar.gz
- Fixed crash in error_log() (strlen(NULL)) reported by: shm, Maksymilian Arciemowicz
-rw-r--r--ext/standard/basic_functions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index cc16a33c2c..92fe1d77b8 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4678,7 +4678,7 @@ PHP_FUNCTION(error_log)
opt_err = erropt;
}
- if (opt_err == 3) {
+ if (opt_err == 3 && opt) {
if (strlen(opt) != opt_len) {
RETURN_FALSE;
}