Correctly handle NULL GError** out parameters

Fixes #1671
gtk-rs · Apr 3, 2024 · 5fe566e · 5fe566e
1 parent 6a7f477
commit 5fe566e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/gdk4/src/subclass/content_provider.rs b/gdk4/src/subclass/content_provider.rs
@@ -382,7 +382,9 @@ unsafe extern "C" fn content_provider_write_mime_type_finish(
             true.into_glib()
         }
         Err(e) => {
-            *error_ptr = e.into_glib_ptr();
+            if !error_ptr.is_null() {
+                *error_ptr = e.into_glib_ptr();
+            }
             false.into_glib()
         }
     }
@@ -404,7 +406,9 @@ unsafe extern "C" fn content_provider_get_value<T: ContentProviderImpl>(
             true.into_glib()
         }
         Err(e) => {
-            *error_ptr = e.into_glib_ptr();
+            if !error_ptr.is_null() {
+                *error_ptr = e.into_glib_ptr();
+            }
             false.into_glib()
         }
     }

diff --git a/gtk4/src/subclass/builder_scope.rs b/gtk4/src/subclass/builder_scope.rs
@@ -183,7 +183,9 @@ unsafe extern "C" fn builder_scope_create_closure<T: BuilderScopeImpl>(
     match ret {
         Ok(closure) => closure.into_glib_ptr(),
         Err(e) => {
-            *errorptr = e.into_glib_ptr();
+            if !errorptr.is_null() {
+                *errorptr = e.into_glib_ptr();
+            }
             std::ptr::null_mut()
         }
     }