diff options
| author | Anatol Belski <ab@php.net> | 2017-07-26 23:10:07 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-07-27 20:11:21 +0200 |
| commit | 49d9b3013fb2ee18b59694aa36036104a4bdd6f2 (patch) | |
| tree | 40da76daa5117b1ba623c3e6fcc5c4d44ce94777 /Zend/zend_execute.c | |
| parent | 00bed31d9f24ce46b461e911c06d7a8b6e2cf1c0 (diff) | |
| download | php-git-49d9b3013fb2ee18b59694aa36036104a4bdd6f2.tar.gz | |
Move cwd_state and path related routines to size_t
Having `int` there is no real profit in the size or speed, while unsigned
improves security and overall integration. ZPP supplied strings can
be then accepted directly and structs can be still handled with smaller
unsigned types for size reasons, which is safe. Yet some related places
are to go.
basic move tsrm_realpath_r to size_t
fix conditions and sync with affected places
touch ocurrences of php_sys_readlink usage
follow up on phar path handling
remove duplicated check
move zend_resolve_path and related pieces to size_t
touch yet resolve path related places
remove cast
missing pieces
missing piece
yet cleanups for php_sys_readlink for ssize_t
fix wrong return
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index c5a4a471c5..6fcc358b2a 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2780,7 +2780,7 @@ static zend_never_inline zend_op_array* ZEND_FASTCALL zend_include_or_eval(zval zend_file_handle file_handle; zend_string *resolved_path; - resolved_path = zend_resolve_path(Z_STRVAL_P(inc_filename), (int)Z_STRLEN_P(inc_filename)); + resolved_path = zend_resolve_path(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename)); if (resolved_path) { if (zend_hash_exists(&EG(included_files), resolved_path)) { goto already_compiled; |