diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-08-10 23:46:58 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-08-10 23:46:58 -0700 |
| commit | 6304a611cdaa3563045dbab84824202bc634bcce (patch) | |
| tree | ad6ace8dcb96f5b9686a714c0bd3b17132e62853 /main/fopen_wrappers.c | |
| parent | 7bf6d985351ad92715b18692ba128842b725f1c0 (diff) | |
| download | php-git-6304a611cdaa3563045dbab84824202bc634bcce.tar.gz | |
Use size_t for path length
Diffstat (limited to 'main/fopen_wrappers.c')
| -rw-r--r-- | main/fopen_wrappers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index c3646ee0fd..bf78db3bdf 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -144,7 +144,7 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path char *path_file; int resolved_basedir_len; int resolved_name_len; - int path_len; + size_t path_len; int nesting_level = 0; /* Special case basedir==".": Use script-directory */ @@ -153,7 +153,7 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path strlcpy(local_open_basedir, basedir, sizeof(local_open_basedir)); } - path_len = (int)strlen(path); + path_len = strlen(path); if (path_len > (MAXPATHLEN - 1)) { /* empty and too long paths are invalid */ return -1; @@ -164,7 +164,7 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path return -1; } - path_len = (int)strlen(resolved_name); + path_len = strlen(resolved_name); memcpy(path_tmp, resolved_name, path_len + 1); /* safe */ while (VCWD_REALPATH(path_tmp, resolved_name) == NULL) { |