Bump

Author: emesare

Cargo.lock

@@ -3,7 +3,7 @@
 
 using namespace Warp;
 
-std::string UUID::ToString() const
+std::string WarpUUID::ToString() const
 {
     char *str = BNWARPUUIDGetString(&uuid);
     std::string result = str;

plugins/warp/api/warp.cpp

@@ -224,23 +224,23 @@ namespace Warp {
 		}
 	};
 
-	class UUID
+	class WarpUUID
 	{
 		BNWARPUUID uuid;
 
 	public:
-		UUID() = default;
+		WarpUUID() = default;
 
-		UUID(BNWARPUUID uuid) : uuid(uuid) {}
+		WarpUUID(BNWARPUUID uuid) : uuid(uuid) {}
 
 		std::string ToString() const;
 
-		bool operator==(const UUID &other) const
+		bool operator==(const WarpUUID &other) const
 		{
 			return BNWARPUUIDEqual(&uuid, &other.uuid);
 		}
 
-		bool operator!=(const UUID &other) const
+		bool operator!=(const WarpUUID &other) const
 		{
 			return !(*this == other);
 		}
@@ -256,11 +256,11 @@ namespace Warp {
 		}
 	};
 
-	typedef UUID Source;
-	typedef UUID BasicBlockGUID;
-	typedef UUID FunctionGUID;
-	typedef UUID ConstraintGUID;
-	typedef UUID TypeGUID;
+	typedef WarpUUID Source;
+	typedef WarpUUID BasicBlockGUID;
+	typedef WarpUUID FunctionGUID;
+	typedef WarpUUID ConstraintGUID;
+	typedef WarpUUID TypeGUID;
 
 	class Target : public WarpRefCountObject<BNWARPTarget, BNWARPNewTargetReference,
 				BNWARPFreeTargetReference>

plugins/warp/api/warp.h

@@ -11,8 +11,7 @@ use warp::signature::comment::FunctionComment;
 use warp::target::Target;
 
 pub fn bn_comment_to_comment(func: &BNFunction, bn_comment: BNComment) -> FunctionComment {
-    // TODO: Warp offset needs to be i64 lol.
-    let offset = bn_comment.addr - func.start();
+    let offset = (bn_comment.addr as i64) - (func.start() as i64);
     FunctionComment {
         offset,
         text: bn_comment.comment,
@@ -21,7 +20,10 @@ pub fn bn_comment_to_comment(func: &BNFunction, bn_comment: BNComment) -> Functi
 
 pub fn comment_to_bn_comment(func: &BNFunction, comment: FunctionComment) -> BNComment {
     BNComment {
-        addr: func.start() + comment.offset,
+        addr: comment
+            .offset
+            .checked_add_unsigned(func.start())
+            .unwrap_or_default() as u64,
         comment: comment.text,
     }
 }

plugins/warp/src/convert.rs

@@ -4,9 +4,33 @@ use crate::convert::{to_bn_symbol_at_address, to_bn_type};
 use crate::plugin::ffi::{BNWARPFunction, BNWARPFunctionGUID, BNWarpConstraint};
 use binaryninja::function::Function;
 use binaryninja::rc::Ref;
+use binaryninja::string::BnString;
 use binaryninjacore_sys::{BNFunction, BNSymbol, BNType};
+use std::ffi::c_char;
 use std::mem::ManuallyDrop;
 use std::sync::Arc;
+use warp::signature::comment::FunctionComment;
+
+#[repr(C)]
+pub struct BNWarpFunctionComment {
+    pub text: *mut c_char,
+    pub offset: i64,
+}
+
+impl BNWarpFunctionComment {
+    /// Leaks the text string to be freed with BNWARPFreeFunctionComment
+    pub fn from_owned(value: &FunctionComment) -> Self {
+        let text = BnString::into_raw(BnString::new(&value.text));
+        Self {
+            text,
+            offset: value.offset,
+        }
+    }
+
+    pub fn free_raw(value: &Self) {
+        unsafe { BnString::free_raw(value.text) }
+    }
+}
 
 #[no_mangle]
 pub unsafe extern "C" fn BNWARPGetFunction(
@@ -119,6 +143,23 @@ pub unsafe extern "C" fn BNWARPFunctionGetConstraints(
     raw_constraints_ptr as *mut *mut BNWarpConstraint
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn BNWARPFunctionGetComments(
+    function: *mut BNWARPFunction,
+    count: *mut usize,
+) -> *mut BNWarpFunctionComment {
+    // We do not own function so we should not drop.
+    let function = ManuallyDrop::new(Arc::from_raw(function));
+    let raw_comments: Box<[_]> = function
+        .comments
+        .iter()
+        .map(BNWarpFunctionComment::from_owned)
+        .collect();
+    *count = raw_comments.len();
+    let raw_comments_ptr = Box::into_raw(raw_comments);
+    raw_comments_ptr as *mut BNWarpFunctionComment
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn BNWARPFunctionsEqual(
     function_a: *mut BNWARPFunction,
@@ -156,3 +197,11 @@ pub unsafe extern "C" fn BNWARPFreeFunctionList(functions: *mut *mut BNWARPFunct
         BNWARPFreeFunctionReference(function);
     }
 }
+
+#[no_mangle]
+pub unsafe extern "C" fn BNWARPFreeFunctionComment(comment: *mut BNWarpFunctionComment) {
+    if comment.is_null() {
+        return;
+    }
+    BNWarpFunctionComment::free_raw(&*comment);
+}