From 20dbb4dc7449652ae28ff5a103e2df57cf3ca5ec Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 3 Jun 2011 10:46:01 +0000
Subject: [PATCH] =?UTF-8?q?trunk=20r311=20WiFi=E3=82=B3=E3=83=8D=E3=82=AF?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3ID=E8=A8=88=E7=AE=97=E3=81=AE?=
 =?UTF-8?q?=E3=83=93=E3=83=83=E3=83=88=E3=83=9E=E3=82=B9=E3=82=AF=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E3=82=92=E3=83=9E=E3=83=BC=E3=82=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@312 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../ConsoleDataMigration/ConsoleRestore/Importer.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/branches/0thNUP_No_NUP/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/branches/0thNUP_No_NUP/ConsoleDataMigration/ConsoleRestore/Importer.cpp
index aa6cd46..aeea762 100644
--- a/branches/0thNUP_No_NUP/ConsoleDataMigration/ConsoleRestore/Importer.cpp
+++ b/branches/0thNUP_No_NUP/ConsoleDataMigration/ConsoleRestore/Importer.cpp
@@ -737,20 +737,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<common::NtrNorData*>(buf)->NtrWiFiSetting;
             std::memcpy(&attestedUserId1,
-                    &reinterpret_cast<common::NtrNorData*> (buf)->NtrWiFiSetting[WIFI_CONNECTION_USERID_OFFSET1],
+                    &reinterpret_cast<u8*>(NtrWifiSettingAddr)[WIFI_CONNECTION_USERID_OFFSET1],
                     USERID_SIZE);
             attestedUserId1 &= USERID_MASK;
 
             std::memcpy(&attestedUserId2,
-                    &reinterpret_cast<common::NtrNorData*> (buf)->NtrWiFiSetting[WIFI_CONNECTION_USERID_OFFSET2],
+                    &reinterpret_cast<u8*>(NtrWifiSettingAddr)[WIFI_CONNECTION_USERID_OFFSET2],
                     USERID_SIZE);
             attestedUserId2 &= USERID_MASK;