Merge pull request #1 from rabbitboots/main

Add type-checks to getInfo, getDirectoryItems and getDirectoryItemsInfo
This commit is contained in:
Engineer Smith
2022-02-28 22:23:37 +00:00
committed by GitHub

View File

@@ -351,6 +351,9 @@ local function withTempMount(dir, fn, ...)
end end
function nativefs.getDirectoryItems(dir) function nativefs.getDirectoryItems(dir)
if type(dir) ~= "string" then
error("bad argument #1 to 'getDirectoryItems' (string expected, got " .. type(dir) .. ")")
end
local result, err = withTempMount(dir, love.filesystem.getDirectoryItems) local result, err = withTempMount(dir, love.filesystem.getDirectoryItems)
return result or {} return result or {}
end end
@@ -370,6 +373,9 @@ local function getDirectoryItemsInfo(path, filtertype)
end end
function nativefs.getDirectoryItemsInfo(path, filtertype) function nativefs.getDirectoryItemsInfo(path, filtertype)
if type(path) ~= "string" then
error("bad argument #1 to 'getDirectoryItemsInfo' (string expected, got " .. type(path) .. ")")
end
local result, err = withTempMount(path, getDirectoryItemsInfo, filtertype) local result, err = withTempMount(path, getDirectoryItemsInfo, filtertype)
return result or {} return result or {}
end end
@@ -392,6 +398,9 @@ local function leaf(p)
end end
function nativefs.getInfo(path, filtertype) function nativefs.getInfo(path, filtertype)
if type(path) ~= 'string' then
error("bad argument #1 to 'getInfo' (string expected, got " .. type(path) .. ")")
end
local dir = path:match("(.*[\\/]).*$") or './' local dir = path:match("(.*[\\/]).*$") or './'
local file = leaf(path) local file = leaf(path)
local result, err = withTempMount(dir, getInfo, file, filtertype) local result, err = withTempMount(dir, getInfo, file, filtertype)