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

Merge pull request #417 from Rhodan81/master 

Fix crash in memory allocation when there is no space to fit entire page
This commit is contained in:
Ben Vanik 2015-09-05 07:26:34 -07:00
parent 65d91e30ca 9427d03d5a
commit df7a35f196
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xenia/memory.cc
View File

@ -650,9 +650,15 @@ bool BaseHeap::AllocRange(uint32_t low_address, uint32_t high_address,
// At least one page in the range is used, skip to next.
// We know we'll be starting at least before this page.
any_taken = true;
base_page_number = page_number - page_count;
base_page_number -= base_page_number % page_scan_stride;
base_page_number += page_scan_stride; // cancel out loop logic
if (page_count > page_number) {
// Not enough space left to fit entire page range. Breaks outer
// loop.
base_page_number = -1;
} else {
base_page_number = page_number - page_count;
base_page_number -= base_page_number % page_scan_stride;
base_page_number += page_scan_stride; // cancel out loop logic
}
break;
}
}