Fix UAF on C++ BinaryView plugin init, improve demangler and BinaryView APIs

1 files changed, 12 insertions, 0 deletions

diff --git a/rapidjson/document.h b/rapidjson/document.h
index 5ae54685..549bfcdc 100644
--- a/rapidjson/document.h
+++ b/rapidjson/document.h
@@ -1147,7 +1147,11 @@ public:
         return FindMember(n);
     }
 
+#ifdef BINARYNINJACORE_LIBRARY
     MemberIterator FindMember(const BinaryNinjaCore::string& name) {
+#else
+    MemberIterator FindMember(const std::string& name) {
+#endif
         GenericValue n(StringRef(name.data(), name.size()));
         return FindMember(n);
     }
@@ -1224,7 +1228,11 @@ public:
         return *this;
     }
 
+#ifdef BINARYNINJACORE_LIBRARY
     GenericValue& AddMember(GenericValue& name, BinaryNinjaCore::string& value, Allocator& allocator) {
+#else
+    GenericValue& AddMember(GenericValue& name, std::string& value, Allocator& allocator) {
+#endif
         GenericValue v(value.data(), allocator);
         return AddMember(name, v, allocator);
     }
@@ -1571,7 +1579,11 @@ public:
         return *this;
     }
 
+#ifdef BINARYNINJACORE_LIBRARY
     GenericValue& PushBack(BinaryNinjaCore::string value, Allocator& allocator) {
+#else
+    GenericValue& PushBack(std::string value, Allocator& allocator) {
+#endif
         GenericValue v(value.c_str(), allocator);
         return PushBack(v, allocator);
     }