diff options
Diffstat (limited to 'ext/standard/ftok.c')
| -rw-r--r-- | ext/standard/ftok.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ext/standard/ftok.c b/ext/standard/ftok.c index 09f77fb5a1..3b0105994c 100644 --- a/ext/standard/ftok.c +++ b/ext/standard/ftok.c @@ -35,14 +35,10 @@ PHP_FUNCTION(ftok) int pathname_len, proj_len; key_t k; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &pathname, &pathname_len, &proj, &proj_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ps", &pathname, &pathname_len, &proj, &proj_len) == FAILURE) { return; } - if (strlen(pathname) != pathname_len) { - RETURN_FALSE; - } - if (pathname_len == 0){ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Pathname is invalid"); RETURN_LONG(-1); @@ -51,9 +47,9 @@ PHP_FUNCTION(ftok) if (proj_len != 1){ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Project identifier is invalid"); RETURN_LONG(-1); - } + } - if ((PG(safe_mode) && (!php_checkuid(pathname, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(pathname TSRMLS_CC)) { + if (php_check_open_basedir(pathname TSRMLS_CC)) { RETURN_LONG(-1); } |