mirrors/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool.git synced 2024-12-22 10:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip bad title.keys rows instead of throwing an exception.

Browse source
This commit is contained in:
Jack 2024-01-20 11:20:56 +08:00
parent 811334bae5
commit 85dd51f496
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/KeyBag.cpp
View file

@ -470,7 +470,8 @@ void nstool::KeyBagInitializer::importTitleKeyFile(const tc::io::Path& keyfile_p
tmp = tc::cli::FormatUtil::hexStringToBytes(itr->first); tmp = tc::cli::FormatUtil::hexStringToBytes(itr->first);
if (tmp.size() != rights_id_tmp.size()) if (tmp.size() != rights_id_tmp.size())
{ {
throw tc::ArgumentException("nstool::KeyBagInitializer", "RightsID: \"" + itr->first + "\" has incorrect length"); fmt::print("[nstool::KeyBagInitializer WARNING] RightsID: \"{}\" has incorrect length. Skipping...\n", itr->first);
continue;
} }
memcpy(rights_id_tmp.data(), tmp.data(), rights_id_tmp.size()); memcpy(rights_id_tmp.data(), tmp.data(), rights_id_tmp.size());
@ -478,7 +479,8 @@ void nstool::KeyBagInitializer::importTitleKeyFile(const tc::io::Path& keyfile_p
tmp = tc::cli::FormatUtil::hexStringToBytes(itr->second); tmp = tc::cli::FormatUtil::hexStringToBytes(itr->second);
if (tmp.size() != title_key_tmp.size()) if (tmp.size() != title_key_tmp.size())
{ {
throw tc::ArgumentException("nstool::KeyBagInitializer", "TitleKey for \""+ itr->first + "\": \"" + itr->second + "\" has incorrect length"); fmt::print("[nstool::KeyBagInitializer WARNING] TitleKey for \"{}\": \"{}\" has incorrect length. Skipping...\n", itr->first, itr->second);
continue;
} }
memcpy(title_key_tmp.data(), tmp.data(), title_key_tmp.size()); memcpy(title_key_tmp.data(), tmp.data(), title_key_tmp.size());