encounter/rust-sdl2
0
0
Fork 0
mirror of https://github.com/encounter/rust-sdl2.git synced 2026-07-10 21:18:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1176 from aceArt-GmbH/patch-1

Browse Source 
Prevent use-after-drop bug in set_viewport
This commit is contained in:
Cobrand
2021-12-07 12:10:40 +01:00
committed by GitHub
parent 5b2399daad 87b27bce8d
commit 3a5ecef929
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdl2/render.rs
+7 -13
View File
@@ -1095,10 +1095,9 @@ impl<T: RenderTarget> Canvas<T> {
/// Sets the drawing area for rendering on the current target.
#[doc(alias = "SDL_RenderSetViewport")]
pub fn set_viewport<R: Into<Option<Rect>>>(&mut self, rect: R) {
let ptr = match rect.into() {
Some(ref rect) => rect.raw(),
None => ptr::null(),
};
let rect = rect.into();
// as_ref is important because we need rect to live until the end of the FFI call, but map_or consumes an Option<T>
let ptr = rect.as_ref().map_or(ptr::null(), |rect| rect.raw());
let ret = unsafe { sys::SDL_RenderSetViewport(self.context.raw, ptr) };
if ret != 0 {
panic!("Could not set viewport: {}", get_error())
@@ -1119,15 +1118,10 @@ impl<T: RenderTarget> Canvas<T> {
/// If the rectangle is `None`, clipping will be disabled.
#[doc(alias = "SDL_RenderSetClipRect")]
pub fn set_clip_rect<R: Into<Option<Rect>>>(&mut self, rect: R) {
let ret = unsafe {
sys::SDL_RenderSetClipRect(
self.context.raw,
match rect.into() {
Some(ref rect) => rect.raw(),
None => ptr::null(),
},
)
};
let rect = rect.into();
// as_ref is important because we need rect to live until the end of the FFI call, but map_or consumes an Option<T>
let ptr = rect.as_ref().map_or(ptr::null(), |rect| rect.raw());
let ret = unsafe { sys::SDL_RenderSetClipRect(self.context.raw, ptr) };
if ret != 0 {
panic!("Could not set clip rect: {}", get_error())
}