summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/Blob.cpp
diff options
context:
space:
mode:
authorflacs <tilkax@gmail.com>2015-10-12 05:21:34 +0200
committerflacs <tilkax@gmail.com>2015-10-12 05:21:34 +0200
commit4c3dc0c1ae81e062b13cc3f1d21d367795698831 (patch)
treec4d8555401c87425f5655e07071ada70e48fc7b8 /Source/Core/DiscIO/Blob.cpp
parent4467c762d73ead1f9e51b833682836c20a547041 (diff)
parent00aefa5e08a9aa6865a14706dcf35346993fa517 (diff)
Merge pull request #3047 from Tilka/decompress_for_md5
DolphinWX: decompress discs to calculate MD5 hash
Diffstat (limited to 'Source/Core/DiscIO/Blob.cpp')
-rw-r--r--Source/Core/DiscIO/Blob.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/Core/DiscIO/Blob.cpp b/Source/Core/DiscIO/Blob.cpp
index 9ed8577c38..1a2333f198 100644
--- a/Source/Core/DiscIO/Blob.cpp
+++ b/Source/Core/DiscIO/Blob.cpp
@@ -77,23 +77,19 @@ bool SectorReader::Read(u64 offset, u64 size, u8* out_ptr)
continue;
}
+ const u8* data = GetBlockData(block);
+ if (!data)
+ return false;
+
u32 toCopy = m_blocksize - positionInBlock;
if (toCopy >= remain)
{
- const u8* data = GetBlockData(block);
- if (!data)
- return false;
-
// Yay, we are done!
memcpy(out_ptr, data + positionInBlock, (size_t)remain);
return true;
}
else
{
- const u8* data = GetBlockData(block);
- if (!data)
- return false;
-
memcpy(out_ptr, data + positionInBlock, toCopy);
out_ptr += toCopy;
remain -= toCopy;