Make skill result size check an assertion

This commit is contained in:
gsemaj 2023-07-23 10:46:53 -04:00 committed by gsemaj
parent e3c3da87b2
commit 13e71de785
2 changed files with 4 additions and 8 deletions

View File

@ -5,8 +5,6 @@
#include "Buffs.hpp" #include "Buffs.hpp"
#include "Nanos.hpp" #include "Nanos.hpp"
#include <assert.h>
using namespace Abilities; using namespace Abilities;
std::map<int32_t, SkillData> Abilities::SkillTable; std::map<int32_t, SkillData> Abilities::SkillTable;

View File

@ -7,6 +7,7 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include <assert.h>
constexpr size_t MAX_SKILLRESULT_SIZE = sizeof(sSkillResult_BatteryDrain); constexpr size_t MAX_SKILLRESULT_SIZE = sizeof(sSkillResult_BatteryDrain);
@ -75,12 +76,9 @@ struct SkillResult {
size_t size; size_t size;
uint8_t payload[MAX_SKILLRESULT_SIZE]; uint8_t payload[MAX_SKILLRESULT_SIZE];
SkillResult(size_t len, void* dat) { SkillResult(size_t len, void* dat) {
if(len <= MAX_SKILLRESULT_SIZE) { assert(len <= MAX_SKILLRESULT_SIZE);
size = len; size = len;
memcpy(payload, dat, len); memcpy(payload, dat, len);
} else {
size = 0;
}
} }
SkillResult() { SkillResult() {
size = 0; size = 0;