drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

[jasper/world/studio/worldobjectseteditor] Fix possible array overrun

Browse Source
This commit is contained in:
Gary Talent
2025-01-13 22:16:32 -06:00
parent 2d7f55fe07
commit a4045cfae5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/jasper/modules/world/src/studio/worldobjectseteditor/worldobjectseteditor-imgui.cpp
View File

@ -144,15 +144,17 @@ void WorldObjectSetEditorImGui::loadObj() noexcept {
w = m_visibleSubsheet->columns; w = m_visibleSubsheet->columns;
h = m_visibleSubsheet->rows; h = m_visibleSubsheet->rows;
} }
auto const idx = getTileIdx( auto const tileIdx = getTileIdx(
*m_tileSheet, *m_tileSheet,
subsheetId).or_value(0); subsheetId).or_value(0);
auto const&palAddr = m_doc.palettes.size() > obj.palBank ?
m_doc.palettes[obj.palBank] : ox::FileAddress{};
oxLogError(m_colView.setup( oxLogError(m_colView.setup(
m_doc.tilesheet, m_doc.tilesheet,
m_doc.palettes[obj.palBank], palAddr,
w, w,
h, h,
static_cast<uint_t>(idx), static_cast<uint_t>(tileIdx),
obj.collisionMap)); obj.collisionMap));
} }