com php-src: Use size_t for path length: main/fopen _wrappers.c

From: Date: Thu, 11 Aug 2016 06:46:58 +0000
Subject: com php-src: Use size_t for path length: main/fopen _wrappers.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93862@lists.php.net to get a copy of this message
Commit: 6304a611cdaa3563045dbab84824202bc634bcce Author: Stanislav Malyshev <stas@php.net> Wed, 10 Aug 2016 23:46:58 -0700 Parents: 7bf6d985351ad92715b18692ba128842b725f1c0 Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6304a611cdaa3563045dbab84824202bc634bcce Log: Use size_t for path length Changed paths: M main/fopen_wrappers.c Diff: diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index c3646ee..bf78db3 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) {

« previous php.cvs (#93862) next »