Commit 4285ef50 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'null-alloc' into 'master'

Fix global allocator

See merge request redox-os/uefi_alloc!3
parents 482befe0 1a07e437
...@@ -29,7 +29,7 @@ unsafe impl GlobalAlloc for Allocator { ...@@ -29,7 +29,7 @@ unsafe impl GlobalAlloc for Allocator {
.branch(); .branch();
match res { match res {
ControlFlow::Continue(ptr) => ptr as *mut u8, ControlFlow::Continue(_) => ptr as *mut u8,
ControlFlow::Break(_) => ptr::null_mut(), ControlFlow::Break(_) => ptr::null_mut(),
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment