mirror of
https://github.com/rvtr/ctr_Repair.git
synced 2025-10-31 13:51:08 -04:00
マージされたリビジョン517を branches/work/VerificationFailed から取り消す:
32バイトアラインのヒープを渡す ........ すでに32バイトアラインになっていた git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@518 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
parent
9b578ad19c
commit
7a747bf781
@ -489,14 +489,14 @@ void WriteTwlData(enum common::TWL_PATH_INDEX path)
|
|||||||
// 進捗表示用
|
// 進捗表示用
|
||||||
common::InitializeTransferProgress(fileSize);
|
common::InitializeTransferProgress(fileSize);
|
||||||
|
|
||||||
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 4);
|
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 2);
|
||||||
NN_LOG("AllocatableSize = %d\n", bufSize);
|
NN_LOG("AllocatableSize = %d\n", bufSize);
|
||||||
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
||||||
{
|
{
|
||||||
bufSize = common::FILE_COPY_HEAP_SIZE;
|
bufSize = common::FILE_COPY_HEAP_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
common::HeapManager writeHeap(bufSize, AES_BLOCK_SIZE * 4);
|
common::HeapManager writeHeap(bufSize, AES_BLOCK_SIZE * 2);
|
||||||
void* buf = writeHeap.GetAddr();
|
void* buf = writeHeap.GetAddr();
|
||||||
if (buf != NULL)
|
if (buf != NULL)
|
||||||
{
|
{
|
||||||
@ -616,14 +616,14 @@ void WriteTwlSaveData()
|
|||||||
result = common::SdMountManager::Mount();
|
result = common::SdMountManager::Mount();
|
||||||
COMMON_LOGGER_RETURN_VOID_SET_BOOL_IF_FAILED(result, s_IsExportSucceeded);
|
COMMON_LOGGER_RETURN_VOID_SET_BOOL_IF_FAILED(result, s_IsExportSucceeded);
|
||||||
|
|
||||||
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 4);
|
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 2);
|
||||||
NN_LOG("AllocatableSize = %d\n", bufSize);
|
NN_LOG("AllocatableSize = %d\n", bufSize);
|
||||||
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
||||||
{
|
{
|
||||||
bufSize = common::FILE_COPY_HEAP_SIZE;
|
bufSize = common::FILE_COPY_HEAP_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
common::HeapManager writeHeap(bufSize, AES_BLOCK_SIZE * 4);
|
common::HeapManager writeHeap(bufSize, AES_BLOCK_SIZE * 2);
|
||||||
void* buf = writeHeap.GetAddr();
|
void* buf = writeHeap.GetAddr();
|
||||||
if (buf != NULL)
|
if (buf != NULL)
|
||||||
{
|
{
|
||||||
@ -767,14 +767,14 @@ void ExportThreadFunc()
|
|||||||
|
|
||||||
result = common::SdMountManager::Mount();
|
result = common::SdMountManager::Mount();
|
||||||
|
|
||||||
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 4);
|
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 2);
|
||||||
NN_LOG("AllocatableSize = %d\n", bufSize);
|
NN_LOG("AllocatableSize = %d\n", bufSize);
|
||||||
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
||||||
{
|
{
|
||||||
bufSize = common::FILE_COPY_HEAP_SIZE;
|
bufSize = common::FILE_COPY_HEAP_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
common::HeapManager writeHeap(bufSize, AES_BLOCK_SIZE * 4);
|
common::HeapManager writeHeap(bufSize, AES_BLOCK_SIZE * 2);
|
||||||
void* buf = writeHeap.GetAddr();
|
void* buf = writeHeap.GetAddr();
|
||||||
if (buf != NULL)
|
if (buf != NULL)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -706,14 +706,14 @@ void ImportThreadFunc()
|
|||||||
result = common::SdMountManager::Mount();
|
result = common::SdMountManager::Mount();
|
||||||
COMMON_LOGGER_RETURN_VOID_SET_BOOL_IF_FAILED(result, s_IsImportSucceeded);
|
COMMON_LOGGER_RETURN_VOID_SET_BOOL_IF_FAILED(result, s_IsImportSucceeded);
|
||||||
|
|
||||||
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 4);
|
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 2);
|
||||||
NN_LOG("AllocatableSize = %d\n", bufSize);
|
NN_LOG("AllocatableSize = %d\n", bufSize);
|
||||||
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
||||||
{
|
{
|
||||||
bufSize = common::FILE_COPY_HEAP_SIZE;
|
bufSize = common::FILE_COPY_HEAP_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 4);
|
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 2);
|
||||||
void* buf = heap.GetAddr();
|
void* buf = heap.GetAddr();
|
||||||
if (buf != NULL)
|
if (buf != NULL)
|
||||||
{
|
{
|
||||||
@ -1493,7 +1493,7 @@ void ImportTwlData(enum common::TWL_PATH_INDEX path, s64 fileSize)
|
|||||||
result = common::SdMountManager::Mount();
|
result = common::SdMountManager::Mount();
|
||||||
COMMON_LOGGER_RETURN_VOID_SET_BOOL_IF_FAILED(result, s_IsImportSucceeded);
|
COMMON_LOGGER_RETURN_VOID_SET_BOOL_IF_FAILED(result, s_IsImportSucceeded);
|
||||||
|
|
||||||
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 4);
|
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 2);
|
||||||
NN_LOG("AllocatableSize = %d\n", bufSize);
|
NN_LOG("AllocatableSize = %d\n", bufSize);
|
||||||
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
||||||
{
|
{
|
||||||
@ -1503,7 +1503,7 @@ void ImportTwlData(enum common::TWL_PATH_INDEX path, s64 fileSize)
|
|||||||
// ファイルサイズ設定
|
// ファイルサイズ設定
|
||||||
common::InitializeTransferProgress(fileSize);
|
common::InitializeTransferProgress(fileSize);
|
||||||
|
|
||||||
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 4);
|
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 2);
|
||||||
void* buf = heap.GetAddr();
|
void* buf = heap.GetAddr();
|
||||||
if (buf != NULL)
|
if (buf != NULL)
|
||||||
{
|
{
|
||||||
@ -1538,7 +1538,7 @@ void ImportTwlTitleSaveData(s64 fileSize)
|
|||||||
result = common::SdMountManager::Mount();
|
result = common::SdMountManager::Mount();
|
||||||
COMMON_LOGGER_RETURN_VOID_SET_BOOL_IF_FAILED(result, s_IsImportSucceeded);
|
COMMON_LOGGER_RETURN_VOID_SET_BOOL_IF_FAILED(result, s_IsImportSucceeded);
|
||||||
|
|
||||||
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 4);
|
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 2);
|
||||||
NN_LOG("AllocatableSize = %d\n", bufSize);
|
NN_LOG("AllocatableSize = %d\n", bufSize);
|
||||||
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
||||||
{
|
{
|
||||||
@ -1548,7 +1548,7 @@ void ImportTwlTitleSaveData(s64 fileSize)
|
|||||||
// ファイルサイズ設定
|
// ファイルサイズ設定
|
||||||
common::InitializeTransferProgress(fileSize);
|
common::InitializeTransferProgress(fileSize);
|
||||||
|
|
||||||
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 4);
|
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 2);
|
||||||
void* buf = heap.GetAddr();
|
void* buf = heap.GetAddr();
|
||||||
if (buf != NULL)
|
if (buf != NULL)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -179,13 +179,13 @@ void AddCmacThreadFunc()
|
|||||||
|
|
||||||
result = common::SdMountManager::Mount();
|
result = common::SdMountManager::Mount();
|
||||||
|
|
||||||
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 4);
|
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 2);
|
||||||
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
||||||
{
|
{
|
||||||
bufSize = common::FILE_COPY_HEAP_SIZE;
|
bufSize = common::FILE_COPY_HEAP_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 4);
|
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 2);
|
||||||
void* buf = heap.GetAddr();
|
void* buf = heap.GetAddr();
|
||||||
if (buf != NULL)
|
if (buf != NULL)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -462,14 +462,14 @@ void DecryptThreadFunc()
|
|||||||
|
|
||||||
result = common::SdMountManager::Mount();
|
result = common::SdMountManager::Mount();
|
||||||
|
|
||||||
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 4);
|
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 2);
|
||||||
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
||||||
{
|
{
|
||||||
bufSize = common::FILE_COPY_HEAP_SIZE;
|
bufSize = common::FILE_COPY_HEAP_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
common::SdReaderWriter sdWriter;
|
common::SdReaderWriter sdWriter;
|
||||||
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 4);
|
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 2);
|
||||||
void* buf = heap.GetAddr();
|
void* buf = heap.GetAddr();
|
||||||
if (buf != NULL)
|
if (buf != NULL)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -384,13 +384,13 @@ void VerifyThreadFunc()
|
|||||||
|
|
||||||
result = common::SdMountManager::Mount();
|
result = common::SdMountManager::Mount();
|
||||||
|
|
||||||
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 4);
|
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 2);
|
||||||
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
||||||
{
|
{
|
||||||
bufSize = common::FILE_COPY_HEAP_SIZE;
|
bufSize = common::FILE_COPY_HEAP_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 4);
|
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 2);
|
||||||
void* buf = heap.GetAddr();
|
void* buf = heap.GetAddr();
|
||||||
if (buf != NULL)
|
if (buf != NULL)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -305,13 +305,13 @@ void EncryptThreadFunc()
|
|||||||
|
|
||||||
result = common::SdMountManager::Mount();
|
result = common::SdMountManager::Mount();
|
||||||
|
|
||||||
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 4);
|
size_t bufSize = common::GetAllocatableSize(AES_BLOCK_SIZE * 2);
|
||||||
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
if(bufSize > common::FILE_COPY_HEAP_SIZE)
|
||||||
{
|
{
|
||||||
bufSize = common::FILE_COPY_HEAP_SIZE;
|
bufSize = common::FILE_COPY_HEAP_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 4);
|
common::HeapManager heap(bufSize, AES_BLOCK_SIZE * 2);
|
||||||
void* buf = heap.GetAddr();
|
void* buf = heap.GetAddr();
|
||||||
if (buf != NULL)
|
if (buf != NULL)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user