Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix crash bug in blockallocator when tag strings were too long

Browse Source
This commit is contained in:
Henrik Rydgard 2012-11-07 19:10:34 +01:00
parent a6a6453c60
commit 897bed8072
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/Util/BlockAllocator.cpp
View File

@ -191,17 +191,19 @@ restart:
}
}
void BlockAllocator::Free(u32 position)
bool BlockAllocator::Free(u32 position)
{
BlockAllocator::Block *b = GetBlockFromAddress(position);
if (b)
if (b && b->taken)
{
b->taken = false;
MergeFreeBlocks();
return true;
}
else
{
ERROR_LOG(HLE, "BlockAllocator : invalid free %08x", position);
return false;
}
}

9
Core/Util/BlockAllocator.h
View File

@ -26,7 +26,7 @@ public:
u32 Alloc(u32 &size, bool fromTop = false, const char *tag = 0);
u32 AllocAt(u32 position, u32 size, const char *tag = 0);
void Free(u32 position);
bool Free(u32 position);
bool IsBlockFree(u32 position) {
Block *b = GetBlockFromAddress(position);
if (b)
@ -53,14 +53,15 @@ private:
}
void SetTag(const char *_tag) {
if (_tag)
strcpy(tag, _tag);
strncpy(tag, _tag, 32);
else
strcpy(tag, "---");
strncpy(tag, "---", 32);
tag[31] = 0;
}
u32 start;
u32 size;
bool taken;
char tag[16];
char tag[32];
};
std::list<Block> blocks;