From 6264254065bbae9d89f51cf3330379b7ace09592 Mon Sep 17 00:00:00 2001 From: Mason Reed Date: Sat, 3 May 2025 23:15:17 -0400 Subject: [Rust] Return `String` instead of `BnString` for cases where lossy conversion can be tolerated Still need to go and audit all usage, but realistically the most important places to give the user control are with symbols, where the data can come from non utf8 sources This is still incomplete, I just looked for usage of -> BnString so any other variant was omitted. --- rust/src/data_buffer.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'rust/src/data_buffer.rs') diff --git a/rust/src/data_buffer.rs b/rust/src/data_buffer.rs index 5b7d1ae6..460bb94d 100644 --- a/rust/src/data_buffer.rs +++ b/rust/src/data_buffer.rs @@ -110,9 +110,9 @@ impl DataBuffer { } } - pub fn to_escaped_string(&self, null_terminates: bool, escape_printable: bool) -> BnString { + pub fn to_escaped_string(&self, null_terminates: bool, escape_printable: bool) -> String { unsafe { - BnString::from_raw(BNDataBufferToEscapedString( + BnString::into_string(BNDataBufferToEscapedString( self.0, null_terminates, escape_printable, @@ -124,8 +124,8 @@ impl DataBuffer { Self(unsafe { BNDecodeEscapedString(value.as_ptr()) }) } - pub fn to_base64(&self) -> BnString { - unsafe { BnString::from_raw(BNDataBufferToBase64(self.0)) } + pub fn to_base64(&self) -> String { + unsafe { BnString::into_string(BNDataBufferToBase64(self.0)) } } pub fn from_base64(value: &BnString) -> Self { -- cgit v1.3.1