alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 06:41:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #536 from tomaka/fix-using-freed-memory

Browse source 
Fix calling XFree before reading from memory
This commit is contained in:
tomaka 2015-07-22 09:39:04 +02:00
parent 8577a25d21 65d56e5521
commit 0e3ce75969
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/api/glx/mod.rs
View file

@ -340,13 +340,14 @@ fn create_context(glx: &ffi::glx::Glx, extra_functions: &ffi::glx_extra::Glx, ex
unsafe fn enumerate_configs(glx: &ffi::glx::Glx, xlib: &ffi::Xlib, display: *mut ffi::Display) unsafe fn enumerate_configs(glx: &ffi::glx::Glx, xlib: &ffi::Xlib, display: *mut ffi::Display)
-> Result<Vec<(ffi::glx::types::GLXFBConfig, PixelFormat)>, CreationError> -> Result<Vec<(ffi::glx::types::GLXFBConfig, PixelFormat)>, CreationError>
{ {
let configs = { let configs: Vec<ffi::glx::types::GLXFBConfig> = {
let mut num_configs = 0; let mut num_configs = 0;
let vals = glx.GetFBConfigs(display as *mut _, 0, &mut num_configs); // TODO: screen number let vals = glx.GetFBConfigs(display as *mut _, 0, &mut num_configs); // TODO: screen number
assert!(!vals.is_null()); assert!(!vals.is_null());
let configs = slice::from_raw_parts(vals, num_configs as usize); let configs = slice::from_raw_parts(vals, num_configs as usize);
let ret = configs.to_vec();
(xlib.XFree)(vals as *mut _); (xlib.XFree)(vals as *mut _);
configs.to_vec() ret
}; };
let get_attrib = |attrib: libc::c_int, fb_config: ffi::glx::types::GLXFBConfig| -> i32 { let get_attrib = |attrib: libc::c_int, fb_config: ffi::glx::types::GLXFBConfig| -> i32 {