mirror of
https://github.com/mii443/rust-openvr.git
synced 2025-08-23 00:35:31 +00:00
Merge pull request #26 from Ralith/fix-extension-panic
Fix extension panic
This commit is contained in:
@ -26,6 +26,7 @@ impl<'a> Compositor<'a> {
|
|||||||
let mut buffer: Vec<u8> = Vec::new();
|
let mut buffer: Vec<u8> = Vec::new();
|
||||||
buffer.resize(n as usize, mem::uninitialized());
|
buffer.resize(n as usize, mem::uninitialized());
|
||||||
(self.0.GetVulkanInstanceExtensionsRequired.unwrap())(buffer.as_mut_ptr() as *mut i8, n);
|
(self.0.GetVulkanInstanceExtensionsRequired.unwrap())(buffer.as_mut_ptr() as *mut i8, n);
|
||||||
|
buffer.truncate((n-1) as usize); // Strip trailing null
|
||||||
buffer
|
buffer
|
||||||
};
|
};
|
||||||
temp.split(|&x| x == b' ').map(|x| CString::new(x.to_vec()).expect("extension name contained null byte")).collect()
|
temp.split(|&x| x == b' ').map(|x| CString::new(x.to_vec()).expect("extension name contained null byte")).collect()
|
||||||
@ -37,6 +38,7 @@ impl<'a> Compositor<'a> {
|
|||||||
let mut buffer: Vec<u8> = Vec::new();
|
let mut buffer: Vec<u8> = Vec::new();
|
||||||
buffer.resize(n as usize, mem::uninitialized());
|
buffer.resize(n as usize, mem::uninitialized());
|
||||||
(self.0.GetVulkanDeviceExtensionsRequired.unwrap())(physical_device as *mut _, buffer.as_mut_ptr() as *mut i8, n);
|
(self.0.GetVulkanDeviceExtensionsRequired.unwrap())(physical_device as *mut _, buffer.as_mut_ptr() as *mut i8, n);
|
||||||
|
buffer.truncate((n-1) as usize); // Strip trailing null
|
||||||
buffer
|
buffer
|
||||||
};
|
};
|
||||||
temp.split(|&x| x == b' ').map(|x| CString::new(x.to_vec()).expect("extension name contained null byte")).collect()
|
temp.split(|&x| x == b' ').map(|x| CString::new(x.to_vec()).expect("extension name contained null byte")).collect()
|
||||||
|
Reference in New Issue
Block a user