thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1268 from unknownbrackets/savestates

Browse source 
Bump savestate version, add better error checking
This commit is contained in:
Henrik Rydgård 2013-04-13 02:09:12 -07:00
commit d92dbf8f6d
9 changed files with 56 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Core/HLE/sceKernelThread.cpp
View file

@ -405,7 +405,11 @@ public:
u32 numCallbacks = THREAD_CALLBACK_NUM_TYPES;
p.Do(numCallbacks);
if (numCallbacks != THREAD_CALLBACK_NUM_TYPES)
ERROR_LOG(HLE, "Unable to load state: different kernel object storage.");
{
p.SetError(p.ERROR_FAILURE);
ERROR_LOG(HLE, "Unable to load state: different thread callback storage.");
return;
}
for (size_t i = 0; i < THREAD_CALLBACK_NUM_TYPES; ++i)
{
@ -581,6 +585,7 @@ struct ThreadQueueList
p.Do(numQueues);
if (numQueues != NUM_QUEUES)
{
p.SetError(p.ERROR_FAILURE);
ERROR_LOG(HLE, "Savestate loading error: invalid data");
return;
}