Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion rust/src/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use crate::rc::{Array, CoreArrayProvider, CoreArrayProviderInner, Guard, Ref, Re
use crate::string::{raw_to_string, BnString, IntoCStr, IntoJson};
use binaryninjacore_sys::*;
use std::collections::HashMap;
use std::ffi::CStr;
use std::fmt::{Debug, Display, Formatter};
use std::os::raw::c_char;
use std::slice;
Expand Down Expand Up @@ -158,7 +159,7 @@ impl Metadata {
let list = unsafe { slice::from_raw_parts(ptr, size) };
let vec = list
.iter()
.map(|ptr| unsafe { BnString::from_raw(*ptr) })
.map(|ptr| BnString::new(unsafe { CStr::from_ptr(*ptr) }))
.collect::<Vec<_>>();
unsafe { BNFreeMetadataStringList(ptr, size) };
Some(vec)
Expand Down
11 changes: 11 additions & 0 deletions rust/tests/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@ fn basic_metadata() {
let metadata_4: Ref<Metadata> = From::from(&vec![1.55f64, 2.55f64]);
assert_eq!(metadata_4.get_type(), MetadataType::ArrayDataType);
assert_eq!(metadata_4.get_double_list(), Some(vec![1.55f64, 2.55f64]));

let metadata_5: Ref<Metadata> = From::from(vec!["one", "two"]);
assert_eq!(metadata_5.get_type(), MetadataType::ArrayDataType);
let strings = metadata_5
.get_string_list()
.expect("Expected a string list");
let strings: Vec<_> = strings
.iter()
.map(|s| s.to_string_lossy().into_owned())
.collect();
assert_eq!(strings, vec!["one", "two"]);
}

#[test]
Expand Down
Loading