DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add some safety checks when extending the stack.

Browse Source
This commit is contained in:
aliaspider 2015-11-06 18:31:59 +01:00
parent 2ae326d6a4
commit 9e264473e9
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libctru/source/system/allocateHeaps.c
View File

@ -13,16 +13,37 @@ u32 __allocated_stack_size;
void __system_allocateStack() { void __system_allocateStack() {
u32 tmp=0; u32 tmp=0;
u32 original_stack_bottom;
u32 original_stack_size;
MemInfo memInfo; MemInfo memInfo;
PageInfo pageInfo; PageInfo pageInfo;
register u32 sp_val __asm__("sp"); register u32 sp_val __asm__("sp");
svcQueryMemory(&memInfo, &pageInfo, sp_val); svcQueryMemory(&memInfo, &pageInfo, sp_val);
original_stack_bottom = memInfo.base_addr;
original_stack_size = memInfo.size;
svcQueryMemory(&memInfo, &pageInfo, original_stack_bottom - 0x1000);
if (memInfo.state != MEMSTATE_FREE)
{
original_stack_bottom = memInfo.base_addr;
original_stack_size += memInfo.size;
svcQueryMemory(&memInfo, &pageInfo, original_stack_bottom - 0x1000);
}
if (memInfo.state != MEMSTATE_FREE)
{
__allocated_stack_size = 0;
return;
}
__stacksize__ += 0xFFF; __stacksize__ += 0xFFF;
__stacksize__ &= ~0xFFF; __stacksize__ &= ~0xFFF;
__allocated_stack_size = __stacksize__ > memInfo.size ? __stacksize__ - memInfo.size: 0; __allocated_stack_size = __stacksize__ > original_stack_size ? __stacksize__ - original_stack_size: 0;
__stack_bottom = memInfo.base_addr - __allocated_stack_size; __allocated_stack_size = __allocated_stack_size > memInfo.size ? memInfo.size : __allocated_stack_size;
__stacksize__ = original_stack_size + __allocated_stack_size;
__stack_bottom = original_stack_bottom - __allocated_stack_size;
if (__allocated_stack_size) if (__allocated_stack_size)
svcControlMemory(&tmp, __stack_bottom, 0x0, __allocated_stack_size, MEMOP_ALLOC, MEMPERM_READ | MEMPERM_WRITE); svcControlMemory(&tmp, __stack_bottom, 0x0, __allocated_stack_size, MEMOP_ALLOC, MEMPERM_READ | MEMPERM_WRITE);