michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #220: BumpAllocator overflow

Browse Source 
I also fixed a spelling error and replaced a tab with a space
in the blog post where `allocate()` was created.

(cherry picked from commit 54e02fd6b5)
(cherry picked from commit 3a2f0b33297164ebbfab92ee76881b6c06c4914d)
This commit is contained in:
Calvin Lee
2016-09-22 12:25:59 -06:00
committed by Philipp Oppermann
parent 7ce8d08b2d
commit 0cca3ae90c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/bump_allocator/src/lib.rs
View File

@@ -35,7 +35,7 @@ impl BumpAllocator {
/// Allocates a block of memory with the given size and alignment. /// Allocates a block of memory with the given size and alignment.
fn allocate(&mut self, size: usize, align: usize) -> Option<*mut u8> { fn allocate(&mut self, size: usize, align: usize) -> Option<*mut u8> {
let alloc_start = align_up(self.next, align); let alloc_start = align_up(self.next, align);
let alloc_end = alloc_start + size; let alloc_end = alloc_start.saturating_add(size);
if alloc_end <= self.heap_start + self.heap_size { if alloc_end <= self.heap_start + self.heap_size {
self.next = alloc_end; self.next = alloc_end;