summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2011-06-06 21:28:16 +0000
committerFelipe Pena <felipe@php.net>2011-06-06 21:28:16 +0000
commit32b5f8a1a3552f48d6e91c17b6d9d441c665a44d (patch)
treea6490eaed671ea190f7876994b35169200ff2df8 /main
parenta311dc244353f0ed88a273056224ee5c97cc4011 (diff)
downloadphp-git-32b5f8a1a3552f48d6e91c17b6d9d441c665a44d.tar.gz
- Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
Diffstat (limited to 'main')
-rw-r--r--main/fopen_wrappers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 4ec3e5ee7a..812d591767 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -477,7 +477,7 @@ PHPAPI char *php_resolve_path(const char *filename, int filename_length, const c
char *actual_path;
php_stream_wrapper *wrapper;
- if (!filename) {
+ if (!filename || CHECK_NULL_PATH(filename, filename_length)) {
return NULL;
}