fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复 debug 模式下 tasks.json 检查未通过时的访问越界问题

Browse Source
This commit is contained in:
zzyyyl
2023-09-19 20:34:38 +08:00
parent 41f55c6997
commit d4c1f4e7de
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/MaaCore/Config/TaskData.cpp
View File

@@ -187,6 +187,11 @@ bool asst::TaskData::parse(const json::value& json)
std::string_view name = task_queue.front();
task_queue.pop();
auto task = get(name); // 这里会提前展开任务
if (task == nullptr) [[unlikely]] {
Log.error("Task", name, "not successfully generated");
validity = false;
continue;
}
auto check_tasklist = [&](const tasklist_t& task_list, std::string_view list_type,
bool enable_justreturn_check = false) {
std::unordered_set<std::string_view> tasks_set {};
@@ -195,10 +200,6 @@ bool asst::TaskData::parse(const json::value& json)
if (tasks_set.contains(task_name)) [[unlikely]] {
continue;
}
if (!checking_task_set.contains(task_name)) {
task_queue.emplace(task_name_view(task_name));
checking_task_set.emplace(task_name_view(task_name));
}
// 检查是否有 JustReturn 任务不是最后一个任务
if (enable_justreturn_check && !justreturn_task_name.empty()) [[unlikely]] {
Log.error((std::string(name) += "->") += list_type,
@@ -210,11 +211,16 @@ bool asst::TaskData::parse(const json::value& json)
if (auto ptr = get_raw(task_name); ptr == nullptr) [[unlikely]] {
Log.error(task_name, "in", (std::string(name) += "->") += list_type, "is null");
validity = false;
continue;
}
else if (ptr->algorithm == AlgorithmType::JustReturn) {
justreturn_task_name = ptr->name;
}
if (!checking_task_set.contains(task_name)) {
task_queue.emplace(task_name_view(task_name));
checking_task_set.emplace(task_name_view(task_name));
}
tasks_set.emplace(task_name_view(task_name));
}