Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(server/openInventory): check if data is a table before accessing it #1655

Merged
merged 1 commit into from
Mar 15, 2024
Merged

fix(server/openInventory): check if data is a table before accessing it #1655

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,11 @@ local function openInventory(source, invType, data, ignoreSecurityChecks)
end

if data then
local isDataTable = type(data) == 'table'
if invType == 'stash' then
right = Inventory(data, left)
if right == false then return false end
elseif type(data) == 'table' then
elseif isDataTable then
if data.netid then
data.type = invType
right = Inventory(data)
Expand Down Expand Up @@ -164,7 +165,7 @@ local function openInventory(source, invType, data, ignoreSecurityChecks)
}

if invType == 'container' then hookPayload.slot = left.containerSlot end
if data.netid then hookPayload.netId = data.netid end
if isDataTable and data.netid then hookPayload.netId = data.netid end

if not TriggerEventHooks('openInventory', hookPayload) then return end

Expand Down