nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-11-22 06:45:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

An improved fix for info pointer chain segfault (#1580)

Browse Source 
* An improved fix for info pointer chain segfault

* Only set ptr chain's end if previous head is not null
This commit is contained in:
Okko Hakola 2021-05-17 13:18:46 +03:00 committed by GitHub
parent 2193c0ee50
commit 08634dd7ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vulkano/src/memory/device_memory.rs
View File

@ -205,13 +205,31 @@ impl<'a> DeviceMemoryBuilder<'a> {
self
}
// Private function -- no doc comment needed! Copied shamelessly and poorly from Ash.
// Private function copied shamelessly from Ash.
// https://github.com/MaikKlein/ash/blob/4ba8637d018fec6d6e3a90d7fa47d11c085f6b4a/generator/src/lib.rs
#[allow(unused_assignments)]
fn push_next<T: ExtendsMemoryAllocateInfo>(self, next: &mut T) -> DeviceMemoryBuilder<'a> {
unsafe {
// `next` here can contain a pointer chain. This means that we must correctly
// attach he head to the root and the tail to the rest of the chain
// For example:
//
// next = A -> B
// Before: `Root -> C -> D -> E`
// After: `Root -> A -> B -> C -> D -> E`
// Convert next to our ptr structure
let next_ptr = next as *mut T as *mut BaseOutStructure;
let mut prev = self.allocate.pNext as *mut BaseOutStructure;
let last_next = ptr_chain_iter(&mut prev).last().unwrap();
(*last_next).p_next = next_ptr as _;
// Previous head (can be null)
let mut prev_head = self.allocate.pNext as *mut BaseOutStructure;
// Retrieve end of next chain
let last_next = ptr_chain_iter(next).last().unwrap();
// Set end of next chain's next to be previous head only if previous head's next'
if !prev_head.is_null() {
(*last_next).p_next = (*prev_head).p_next;
}
// Set next ptr to be first one
prev_head = next_ptr;
}
self