leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iOS: Fix the longjmp/setjmp ffi (#613)

Browse source 
* iOS: Fix the `longjmp`/`setjmp` ffi. `jmp_buf` was the wrong size (too small) causing crashes on application launch, make longjmp return Never

* remove extra parentheses around JBLEN, and add a changelog entry about the JmpBuf fix
This commit is contained in:
mtak- 2018-07-26 16:27:26 -07:00 • committed by Francesca Frangipane
parent 88427262a6
commit 4c117aa282
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/platform/ios/mod.rs
View file

@ -92,6 +92,7 @@ use self::ffi::{
CGPoint,
CGRect,
id,
JBLEN,
JmpBuf,
kCFRunLoopDefaultMode,
kCFRunLoopRunHandledSource,
@ -209,7 +210,7 @@ impl EventsLoop {
pub fn new() -> EventsLoop {
unsafe {
if !msg_send![class!(NSThread), isMainThread] {
panic!("`Window` can only be created on the main thread on iOS");
panic!("`EventsLoop` can only be created on the main thread on iOS");
}
}
EventsLoop { events_queue: Default::default() }
@ -315,7 +316,7 @@ impl Window {
) -> Result<Window, CreationError> {
unsafe {
debug_assert!(mem::size_of_val(&JMPBUF) == mem::size_of::<Box<JmpBuf>>());
assert!(mem::replace(&mut JMPBUF, Some(Box::new([0; 27]))).is_none(), "Only one `Window` is supported on iOS");
assert!(mem::replace(&mut JMPBUF, Some(Box::new([0; JBLEN]))).is_none(), "Only one `Window` is supported on iOS");
}
unsafe {