Merge pull request #376 from sephiroth99/big-alloc-fix

[RFC] Fix crash when some games request too much memory
2015-07-29 23:48:12 -07:00 · 2015-07-29 23:48:12 -07:00 · 14e129ced6
parent ab18fec1b3 510a8e59cf
commit 14e129ced6
1 changed files with 5 additions and 0 deletions
--- a/src/xenia/memory.cc
+++ b/src/xenia/memory.cc
@ -615,6 +615,11 @@ bool BaseHeap::AllocRange(uint32_t low_address, uint32_t high_address,
  high_page_number =
      std::min(uint32_t(page_table_.size()) - 1, high_page_number);

+  if (page_count > (high_page_number - low_page_number)) {
+    XELOGE("BaseHeap::Alloc page count too big for requested range");
+    return false;
+  }
+
  std::lock_guard<xe::recursive_mutex> lock(heap_mutex_);

  // Find a free page range.