diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp index 9979eed..69778bd 100644 --- a/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp +++ b/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp @@ -278,7 +278,7 @@ void GetSaveDataDirectoryRoot() for (s32 i = 6; i < 8; ++i) { bit32 n = (rootHash[k] >> ((7 - i) * 4)) & 0xf; - NN_TASSERT_(0 <= n && n < 16); + NN_TASSERT_(n < 16); rootStr[i - 6 + k * 2] = static_cast (n < 10 ? '0' + n : 'a' + (n - 10)); } } diff --git a/trunk/ConsoleDataMigration/common/SimplePlayer.cpp b/trunk/ConsoleDataMigration/common/SimplePlayer.cpp index 9753b92..97e8a76 100644 --- a/trunk/ConsoleDataMigration/common/SimplePlayer.cpp +++ b/trunk/ConsoleDataMigration/common/SimplePlayer.cpp @@ -183,7 +183,7 @@ void InitializeSimplePlayer() void PlaySound(u8 index) { - NN_ASSERT(0 <= index <= nFiles); + NN_ASSERT(index <= nFiles); while(!s_SoundThreadInitialized) { diff --git a/trunk/ConsoleDataMigration/common/common_Types.h b/trunk/ConsoleDataMigration/common/common_Types.h index 3190f25..9c7f50d 100644 --- a/trunk/ConsoleDataMigration/common/common_Types.h +++ b/trunk/ConsoleDataMigration/common/common_Types.h @@ -50,6 +50,7 @@ struct VerDef nn::pl::CTR::NetworkUpdateVersion nup; }; +// TODO:リージョン追加時に範囲外アクセスにならないよう注意 const nn::ProgramId cCupVerId[] = { nn::pl::CTR::SHAREDDATA_TITLEID_CUP_VERSION_JP,