ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing free.

This commit is contained in:
Ben Vanik 2013-10-20 15:28:00 -07:00
parent 0c19516de4
commit cddab7ffb0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/core/memory.cc
View File

@ -305,7 +305,7 @@ int xe_memory_heap_free(
if (address >= XE_MEMORY_HEAP_LOW && address < XE_MEMORY_HEAP_HIGH) { if (address >= XE_MEMORY_HEAP_LOW && address < XE_MEMORY_HEAP_HIGH) {
// Heap allocated address. // Heap allocated address.
size_t heap_guard_size = FLAGS_heap_guard_pages * 4096; size_t heap_guard_size = FLAGS_heap_guard_pages * 4096;
p += heap_guard_size; p -= heap_guard_size;
size_t real_size = mspace_usable_size(p); size_t real_size = mspace_usable_size(p);
real_size -= heap_guard_size * 2; real_size -= heap_guard_size * 2;
if (!real_size) { if (!real_size) {
@ -313,6 +313,11 @@ int xe_memory_heap_free(
} }
XEIGNORE(xe_mutex_lock(memory->heap_mutex)); XEIGNORE(xe_mutex_lock(memory->heap_mutex));
if (FLAGS_heap_guard_pages) {
DWORD old_protect;
VirtualProtect(p, heap_guard_size, PAGE_READWRITE, &old_protect);
VirtualProtect(p + heap_guard_size + real_size, heap_guard_size, PAGE_READWRITE, &old_protect);
}
mspace_free(memory->heap, p); mspace_free(memory->heap, p);
if (FLAGS_log_heap) { if (FLAGS_log_heap) {
xe_memory_heap_dump(memory); xe_memory_heap_dump(memory);

2
src/xenia/gpu/d3d11/d3d11_shader.cc
View File

@ -425,7 +425,7 @@ int D3D11PixelShader::Prepare(xe_gpu_program_cntl_t* program_cntl,
NULL, NULL,
&handle_); &handle_);
if (FAILED(hr)) { if (FAILED(hr)) {
XELOGE("D3D11: failed to create vertex shader"); XELOGE("D3D11: failed to create pixel shader");
xe_free(byte_code); xe_free(byte_code);
return 1; return 1;
} }