AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

DNAMP1/CTweakPlayerGun: Prevent array overrun cases 

These arrays are both 5 elements in size. Accessing them at index 5
would be out of bounds.
This commit is contained in:
Lioncash 2019-09-06 08:10:50 -04:00
parent fea7984f71
commit 66ce2774d5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataSpec/DNAMP1/Tweaks/CTweakPlayerGun.hpp
View File

@ -89,14 +89,16 @@ struct CTweakPlayerGun final : ITweakPlayerGun {
} }
const SWeaponInfo& GetBeamInfo(atInt32 beam) const override { const SWeaponInfo& GetBeamInfo(atInt32 beam) const override {
if (beam < 0 || beam > 5) if (beam < 0 || beam >= 5) {
return xa8_beams[0]; return xa8_beams[0];
}
return xa8_beams[beam]; return xa8_beams[beam];
} }
const SComboShotParam& GetComboShotInfo(atInt32 beam) const override { const SComboShotParam& GetComboShotInfo(atInt32 beam) const override {
if (beam < 0 || beam > 5) if (beam < 0 || beam >= 5) {
return x1f0_combos[0]; return x1f0_combos[0];
}
return x1f0_combos[beam]; return x1f0_combos[beam];
} }