Merge pull request #14197 from owncloud/ensure-that-passed-file-path-is-always-a-string
Ensure that passed argument is always a string
This commit is contained in:
commit
276bfe5f33
|
@ -5,7 +5,7 @@ OCP\JSON::checkLoggedIn();
|
|||
$l = \OC::$server->getL10N('files');
|
||||
|
||||
// Load the files
|
||||
$dir = isset($_GET['dir']) ? $_GET['dir'] : '';
|
||||
$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
|
||||
$dir = \OC\Files\Filesystem::normalizePath($dir);
|
||||
|
||||
try {
|
||||
|
|
|
@ -723,9 +723,18 @@ class Filesystem {
|
|||
* Fix common problems with a file path
|
||||
* @param string $path
|
||||
* @param bool $stripTrailingSlash
|
||||
* @param bool $isAbsolutePath
|
||||
* @return string
|
||||
*/
|
||||
public static function normalizePath($path, $stripTrailingSlash = true, $isAbsolutePath = false) {
|
||||
/**
|
||||
* FIXME: This is a workaround for existing classes and files which call
|
||||
* this function with another type than a valid string. This
|
||||
* conversion should get removed as soon as all existing
|
||||
* function calls have been fixed.
|
||||
*/
|
||||
$path = (string)$path;
|
||||
|
||||
$cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath]);
|
||||
|
||||
if(isset(self::$normalizedPathCache[$cacheKey])) {
|
||||
|
|
Loading…
Reference in New Issue