izzy/Torch
0
0
Fork 0
mirror of https://github.com/izzy2lost/Torch.git synced 2026-07-06 00:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

add null checking (#132)

Browse Source
This commit is contained in:
inspectredc
2024-06-09 22:11:41 -06:00
committed by GitHub
parent dd5d75e2b9
commit 4d3f360d66
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/factories/AssetArrayFactory.cpp
+16 -10
View File
@@ -30,13 +30,17 @@ ExportResult AssetArrayCodeExporter::Export(std::ostream &write, std::shared_ptr
write << "static " << data->mType << "* " << symbol << "[] = {\n";
for (auto ptr : data->mPtrs) {
write << fourSpaceTab;
auto dec = Companion::Instance->GetNodeByAddr(ptr);
if (dec.has_value()) {
auto node = std::get<1>(dec.value());
auto assetSymbol = GetSafeNode<std::string>(node, "symbol");
write << "&" << assetSymbol << ",\n";
if (ptr == 0) {
write << "NULL,\n";
} else {
write << FORMAT_HEX(ptr) << ",\n";
auto dec = Companion::Instance->GetNodeByAddr(ptr);
if (dec.has_value()) {
auto node = std::get<1>(dec.value());
auto assetSymbol = GetSafeNode<std::string>(node, "symbol");
write << "&" << assetSymbol << ",\n";
} else {
write << FORMAT_HEX(ptr) << ",\n";
}
}
}
write << "};\n";
@@ -86,10 +90,12 @@ std::optional<std::shared_ptr<IParsedData>> AssetArrayFactory::parse(std::vector
for (uint32_t i = 0; i < count; ++i) {
auto ptr = reader.ReadUInt32();
YAML::Node assetNode;
assetNode["type"] = factoryType;
assetNode["offset"] = ptr;
Companion::Instance->AddAsset(assetNode);
if (ptr != 0) {
YAML::Node assetNode;
assetNode["type"] = factoryType;
assetNode["offset"] = ptr;
Companion::Instance->AddAsset(assetNode);
}
ptrs.emplace_back(ptr);
}