Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-12-12 07:56:03 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #8279 from unknownbrackets/block-mutex

Browse Source 
Mutex around PBP file access
This commit is contained in:
Henrik Rydgård 2015-12-20 18:51:06 +01:00
commit 63e749de5b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/FileSystems/BlockDevices.cpp
View File

@ -344,9 +344,12 @@ bool CISOFileBlockDevice::ReadBlocks(u32 minBlock, int count, u8 *outPtr) {
}
recursive_mutex NPDRMDemoBlockDevice::mutex_;
NPDRMDemoBlockDevice::NPDRMDemoBlockDevice(FileLoader *fileLoader)
: fileLoader_(fileLoader)
{
lock_guard guard(mutex_);
MAC_KEY mkey;
CIPHER_KEY ckey;
u8 np_header[256];
@ -412,6 +415,7 @@ NPDRMDemoBlockDevice::NPDRMDemoBlockDevice(FileLoader *fileLoader)
NPDRMDemoBlockDevice::~NPDRMDemoBlockDevice()
{
lock_guard guard(mutex_);
delete [] table;
delete [] tempBuf;
delete [] blockBuf;
@ -421,6 +425,7 @@ int lzrc_decompress(void *out, int out_len, void *in, int in_len);
bool NPDRMDemoBlockDevice::ReadBlock(int blockNumber, u8 *outPtr)
{
lock_guard guard(mutex_);
CIPHER_KEY ckey;
int block, lba, lzsize;
size_t readSize;

2
Core/FileSystems/BlockDevices.h
View File

@ -25,6 +25,7 @@
#include "Common/CommonTypes.h"
#include "Core/ELF/PBPReader.h"
#include "base/mutex.h"
class FileLoader;
@ -106,6 +107,7 @@ public:
private:
FileLoader *fileLoader_;
static recursive_mutex mutex_;
u32 lbaSize;
u32 psarOffset;