Merge pull request #171 from diamante0018/fix/stringtable-dumping

fix: check for NULL string in stringtable check before dumping
This commit is contained in:
Jan authored and GitHub committed 2024-04-21 20:06:43 +02:00
commit ec22d2a01f
4 files changed
+32 -4

No files matched your search

@@ -24,7 +24,14 @@ void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<
for (auto column = 0; column < stringTable->columnCount; column++) for (auto column = 0; column < stringTable->columnCount; column++)
{ {
const auto* cell = &stringTable->values[column + row * stringTable->columnCount]; const auto* cell = &stringTable->values[column + row * stringTable->columnCount];
csv.WriteColumn(cell->string); if (cell->string != nullptr)
{
csv.WriteColumn(cell->string);
}
else
{
csv.WriteColumn("");
}
} }
csv.NextRow(); csv.NextRow();
@@ -24,7 +24,14 @@ void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<
for (auto column = 0; column < stringTable->columnCount; column++) for (auto column = 0; column < stringTable->columnCount; column++)
{ {
const auto* cell = &stringTable->values[column + row * stringTable->columnCount]; const auto* cell = &stringTable->values[column + row * stringTable->columnCount];
csv.WriteColumn(cell->string); if (cell->string != nullptr)
{
csv.WriteColumn(cell->string);
}
else
{
csv.WriteColumn("");
}
} }
csv.NextRow(); csv.NextRow();
@@ -24,7 +24,14 @@ void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<
for (auto column = 0; column < stringTable->columnCount; column++) for (auto column = 0; column < stringTable->columnCount; column++)
{ {
const auto* cell = &stringTable->values[column + row * stringTable->columnCount]; const auto* cell = &stringTable->values[column + row * stringTable->columnCount];
csv.WriteColumn(cell->string); if (cell->string != nullptr)
{
csv.WriteColumn(cell->string);
}
else
{
csv.WriteColumn("");
}
} }
csv.NextRow(); csv.NextRow();
@@ -24,7 +24,14 @@ void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<
for (auto column = 0; column < stringTable->columnCount; column++) for (auto column = 0; column < stringTable->columnCount; column++)
{ {
const auto* cell = &stringTable->values[column + row * stringTable->columnCount]; const auto* cell = &stringTable->values[column + row * stringTable->columnCount];
csv.WriteColumn(cell->string); if (cell->string != nullptr)
{
csv.WriteColumn(cell->string);
}
else
{
csv.WriteColumn("");
}
} }
csv.NextRow(); csv.NextRow();