graphene: Fix UB in intersect_triangle by validating t_out before assume_init

Author: Renyi Zhao

graphene/Gir.toml

@@ -375,6 +375,9 @@ boxed_inline = true
     name = "init_from_vec3"
     rename = "from_vec3"
     manual = true # manual proper constructor
+    [[object.function]]
+    pattern = "intersect_(box|sphere|triangle)"
+    manual = true # Handle no intersection cases
 
 [[object]]
 name = "Graphene.Rect"

graphene/src/auto/ray.rs

@@ -2,7 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use crate::{ffi, Box, Plane, Point3D, RayIntersectionKind, Sphere, Triangle, Vec3};
+use crate::{ffi, Box, Plane, Point3D, Sphere, Triangle, Vec3};
 use glib::translate::*;
 
 glib::wrapper! {
@@ -85,45 +85,6 @@ impl Ray {
         }
     }
 
-    #[doc(alias = "graphene_ray_intersect_box")]
-    pub fn intersect_box(&self, b: &Box) -> (RayIntersectionKind, f32) {
-        unsafe {
-            let mut t_out = std::mem::MaybeUninit::uninit();
-            let ret = from_glib(ffi::graphene_ray_intersect_box(
-                self.to_glib_none().0,
-                b.to_glib_none().0,
-                t_out.as_mut_ptr(),
-            ));
-            (ret, t_out.assume_init())
-        }
-    }
-
-    #[doc(alias = "graphene_ray_intersect_sphere")]
-    pub fn intersect_sphere(&self, s: &Sphere) -> (RayIntersectionKind, f32) {
-        unsafe {
-            let mut t_out = std::mem::MaybeUninit::uninit();
-            let ret = from_glib(ffi::graphene_ray_intersect_sphere(
-                self.to_glib_none().0,
-                s.to_glib_none().0,
-                t_out.as_mut_ptr(),
-            ));
-            (ret, t_out.assume_init())
-        }
-    }
-
-    #[doc(alias = "graphene_ray_intersect_triangle")]
-    pub fn intersect_triangle(&self, t: &Triangle) -> (RayIntersectionKind, f32) {
-        unsafe {
-            let mut t_out = std::mem::MaybeUninit::uninit();
-            let ret = from_glib(ffi::graphene_ray_intersect_triangle(
-                self.to_glib_none().0,
-                t.to_glib_none().0,
-                t_out.as_mut_ptr(),
-            ));
-            (ret, t_out.assume_init())
-        }
-    }
-
     #[doc(alias = "graphene_ray_intersects_box")]
     pub fn intersects_box(&self, b: &Box) -> bool {
         unsafe { ffi::graphene_ray_intersects_box(self.to_glib_none().0, b.to_glib_none().0) }

graphene/src/ray.rs

@@ -4,7 +4,7 @@ use std::fmt;
 
 use glib::translate::*;
 
-use crate::{ffi, Point3D, Ray, Vec3};
+use crate::{ffi, Box, Point3D, Ray, RayIntersectionKind, Sphere, Triangle, Vec3};
 
 impl Ray {
     #[doc(alias = "graphene_ray_init")]
@@ -35,6 +35,54 @@ impl Ray {
             ray
         }
     }
+
+    #[doc(alias = "graphene_ray_intersect_box")]
+    pub fn intersect_box(&self, b: &Box) -> (RayIntersectionKind, Option<f32>) {
+        unsafe {
+            let mut t_out = std::mem::MaybeUninit::uninit();
+            let ret = from_glib(ffi::graphene_ray_intersect_box(
+                self.to_glib_none().0,
+                b.to_glib_none().0,
+                t_out.as_mut_ptr(),
+            ));
+            match ret {
+                RayIntersectionKind::None => (ret, None),
+                _ => (ret, Some(t_out.assume_init())),
+            }
+        }
+    }
+
+    #[doc(alias = "graphene_ray_intersect_sphere")]
+    pub fn intersect_sphere(&self, s: &Sphere) -> (RayIntersectionKind, Option<f32>) {
+        unsafe {
+            let mut t_out = std::mem::MaybeUninit::uninit();
+            let ret = from_glib(ffi::graphene_ray_intersect_sphere(
+                self.to_glib_none().0,
+                s.to_glib_none().0,
+                t_out.as_mut_ptr(),
+            ));
+            match ret {
+                RayIntersectionKind::None => (ret, None),
+                _ => (ret, Some(t_out.assume_init())),
+            }
+        }
+    }
+
+    #[doc(alias = "graphene_ray_intersect_triangle")]
+    pub fn intersect_triangle(&self, t: &Triangle) -> (RayIntersectionKind, Option<f32>) {
+        unsafe {
+            let mut t_out = std::mem::MaybeUninit::uninit();
+            let ret = from_glib(ffi::graphene_ray_intersect_triangle(
+                self.to_glib_none().0,
+                t.to_glib_none().0,
+                t_out.as_mut_ptr(),
+            ));
+            match ret {
+                RayIntersectionKind::None => (ret, None),
+                _ => (ret, Some(t_out.assume_init())),
+            }
+        }
+    }
 }
 
 impl fmt::Debug for Ray {