From 84030db14f6e9a50ca44e39c0d358ebec8eac5e0 Mon Sep 17 00:00:00 2001
From: Mason Reed <mason@vector35.com>
Date: Thu, 8 Oct 2026 10:36:56 -0700
Subject: [PATCH] [Rust] Fix invalid operand round trip on
 `InstructionTextTokenKind`

We were not setting operand to `None` when the value of the operand coming from core is `INVALID_OPERAND`
---
 rust/src/disassembly.rs | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/rust/src/disassembly.rs b/rust/src/disassembly.rs
index 9aa790cd87..64933d4a2d 100644
--- a/rust/src/disassembly.rs
+++ b/rust/src/disassembly.rs
@@ -44,6 +44,8 @@ use std::fmt::{Display, Formatter};
 use std::ptr;
 use std::ptr::NonNull;
 
+const INVALID_OPERAND: usize = 0xffffffff;
+
 pub type DisassemblyOption = BNDisassemblyOption;
 pub type InstructionTextTokenType = BNInstructionTextTokenType;
 
@@ -612,7 +614,7 @@ impl InstructionTextTokenKind {
                     0 => None,
                     size => Some(size),
                 },
-                operand: Some(value.operand),
+                operand: (value.operand != INVALID_OPERAND).then_some(value.operand),
             },
             BNInstructionTextTokenType::PossibleAddressToken => Self::PossibleAddress {
                 value: value.value,
@@ -620,7 +622,7 @@ impl InstructionTextTokenKind {
                     0 => None,
                     size => Some(size),
                 },
-                operand: Some(value.operand),
+                operand: (value.operand != INVALID_OPERAND).then_some(value.operand),
             },
             BNInstructionTextTokenType::BeginMemoryOperandToken => Self::BeginMemoryOperand,
             BNInstructionTextTokenType::EndMemoryOperandToken => Self::EndMemoryOperand,
@@ -638,7 +640,7 @@ impl InstructionTextTokenKind {
                     0 => None,
                     size => Some(size),
                 },
-                operand: Some(value.operand),
+                operand: (value.operand != INVALID_OPERAND).then_some(value.operand),
             },
             BNInstructionTextTokenType::ArgumentNameToken => {
                 Self::ArgumentName { value: value.value }
@@ -677,7 +679,7 @@ impl InstructionTextTokenKind {
                 _ => Self::String { value: value.value },
             },
             BNInstructionTextTokenType::CharacterConstantToken => Self::CharacterConstant {
-                operand: Some(value.operand),
+                operand: (value.operand != INVALID_OPERAND).then_some(value.operand),
             },
             BNInstructionTextTokenType::KeywordToken => Self::Keyword { value: value.value },
             BNInstructionTextTokenType::TypeNameToken => Self::TypeName,
@@ -837,10 +839,18 @@ impl InstructionTextTokenKind {
     /// Mapping to the [`BNInstructionTextTokenType::operand`] field.
     fn try_operand(&self) -> Option<usize> {
         match self {
-            InstructionTextTokenKind::Integer { operand, .. } => *operand,
-            InstructionTextTokenKind::PossibleAddress { operand, .. } => *operand,
-            InstructionTextTokenKind::CodeRelativeAddress { operand, .. } => *operand,
-            InstructionTextTokenKind::CharacterConstant { operand, .. } => *operand,
+            InstructionTextTokenKind::Integer { operand, .. } => {
+                Some(operand.unwrap_or(INVALID_OPERAND))
+            }
+            InstructionTextTokenKind::PossibleAddress { operand, .. } => {
+                Some(operand.unwrap_or(INVALID_OPERAND))
+            }
+            InstructionTextTokenKind::CodeRelativeAddress { operand, .. } => {
+                Some(operand.unwrap_or(INVALID_OPERAND))
+            }
+            InstructionTextTokenKind::CharacterConstant { operand, .. } => {
+                Some(operand.unwrap_or(INVALID_OPERAND))
+            }
             InstructionTextTokenKind::LocalVariable { ssa_version, .. } => Some(*ssa_version),
             InstructionTextTokenKind::IndirectImport { source_operand, .. } => {
                 Some(*source_operand)
@@ -1262,7 +1272,7 @@ impl DisassemblyTextRenderer {
         size: usize,
         operand: Option<usize>,
     ) -> Option<Array<InstructionTextToken>> {
-        let operand = operand.unwrap_or(0xffffffff);
+        let operand = operand.unwrap_or(INVALID_OPERAND);
         let mut count = 0;
         let mut tokens: *mut BNInstructionTextToken = ptr::null_mut();
         let result = unsafe {