From 3924284900606187048979320293633442046226 Mon Sep 17 00:00:00 2001
From: Glenn Smith <glenn@vector35.com>
Date: Wed, 14 Feb 2024 03:34:20 -0500
Subject: Rust API: Fix crash in load_with_options

---
 rust/src/lib.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'rust/src')

diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index d5190890..c1ba83c7 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -231,16 +231,18 @@ pub fn load_with_options<S: BnStrCompatible>(
 ) -> Option<rc::Ref<binaryview::BinaryView>> {
     let filename = filename.into_bytes_with_nul();
 
+    let options_or_default = if let Some(opt) = options {
+        opt
+    } else {
+        Metadata::new_of_type(MetadataType::KeyValueDataType)
+    };
+
     let handle = unsafe {
         binaryninjacore_sys::BNLoadFilename(
             filename.as_ref().as_ptr() as *mut _,
             update_analysis_and_wait,
             None,
-            if let Some(options) = options {
-                options.as_ref().handle
-            } else {
-                Metadata::new_of_type(MetadataType::KeyValueDataType).handle
-            },
+            options_or_default.as_ref().handle,
         )
     };
 
-- 
cgit v1.3.1