From 8b698a0a936a0910be6f8040fe2009d1ff2c0fe0 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Mon, 19 Dec 2011 09:00:02 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=83=AA?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=81=8C=E7=A9=BA=E3=81=AE=E3=81=A8=E3=81=8D?=
 =?UTF-8?q?=E3=81=ABASSERT=E3=81=A7=E5=81=9C=E6=AD=A2=E3=81=97=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
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@542 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Importer.cpp              | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 6ee3cc8..48c7aca 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -35,6 +35,7 @@
 #include <nn/mcu.h>
 #include <nn/drivers/mcu/CTR/driverMcuRegisterMap.h>
 #include <nn/ndm.h>
+#include <nn/crypto/crypto_AesCmac.h>
 
 #include "FileName.h"
 #include "Importer.h"
@@ -1843,6 +1844,17 @@ nn::Result ReadFileList(SdFileSize* sdFiles, common::ImportDataList* fileList)
         file.Finalize();
     }
 
+    // 初期化状態の場合は空
+    if(fileSize == nn::crypto::AES_CMAC_MAC_SIZE)
+    {
+        sdFiles->ctrFileSize = 0;
+        sdFiles->totalFileSize = 0;
+        sdFiles->twlFileSize = 0;
+        sdFiles->twlPhotoFileSize = 0;
+        sdFiles->twlSoundFileSize = 0;
+        return nn::ResultSuccess();
+    }
+
     common::HeapManager heap(fileSize);
     void* buf = heap.GetAddr();
     if(buf != NULL)