diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp index 6f22326..7109698 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp @@ -751,20 +751,22 @@ nn::Result ImportNorData() // WiFiコネクションIDが仮の値であればWiFi設定は移行しない // TWL修理に準拠している - u64 attestedUserId1; - u64 attestedUserId2; + u64 attestedUserId1 = 0; + u64 attestedUserId2 = 0; const u32 WIFI_CONNECTION_USERID_OFFSET1 = 0xf0; const u32 WIFI_CONNECTION_USERID_OFFSET2 = 0x1f0; const u32 USERID_SIZE = 6; - const bit64 USERID_MASK = 0x07ffffffffffffff; + const bit64 USERID_MASK = 0x7FFFFFFFFFF; // 43bit + + void* NtrWifiSettingAddr = &reinterpret_cast(buf)->NtrWiFiSetting; std::memcpy(&attestedUserId1, - &reinterpret_cast (buf)->NtrWiFiSetting[WIFI_CONNECTION_USERID_OFFSET1], + &reinterpret_cast(NtrWifiSettingAddr)[WIFI_CONNECTION_USERID_OFFSET1], USERID_SIZE); attestedUserId1 &= USERID_MASK; std::memcpy(&attestedUserId2, - &reinterpret_cast (buf)->NtrWiFiSetting[WIFI_CONNECTION_USERID_OFFSET2], + &reinterpret_cast(NtrWifiSettingAddr)[WIFI_CONNECTION_USERID_OFFSET2], USERID_SIZE); attestedUserId2 &= USERID_MASK;