Make Warp function type optional in the C++ bindings

Author: emesare

plugins/warp/api/warp.cpp

@@ -68,12 +68,16 @@ FunctionGUID Function::GetGUID() const
 BinaryNinja::Ref<BinaryNinja::Symbol> Function::GetSymbol(const BinaryNinja::Function &function) const
 {
     BNSymbol *symbol = BNWARPFunctionGetSymbol(m_object, function.m_object);
+    if (!symbol)
+        return nullptr;
     return new BinaryNinja::Symbol(symbol);
 }
 
 BinaryNinja::Ref<BinaryNinja::Type> Function::GetType(const BinaryNinja::Function &function) const
 {
     BNType *type = BNWARPFunctionGetType(m_object, function.m_object);
+    if (!type)
+        return nullptr;
     return new BinaryNinja::Type(type);
 }
 

plugins/warp/ui/shared/function.cpp

@@ -18,23 +18,32 @@ WarpFunctionItem::WarpFunctionItem(Warp::Ref<Warp::Function> function,
     BinaryNinja::Ref<BinaryNinja::Symbol> symbol = m_function->GetSymbol(*analysisFunction);
     std::string symbolName = symbol->GetShortName();
     setText(QString::fromStdString(symbolName));
-
-    // TODO: This needs to be better. Type can be nullptr.
-    BinaryNinja::Ref<BinaryNinja::Type> type = m_function->GetType(*analysisFunction);
-    BinaryNinja::Ref<BinaryNinja::Platform> platform = analysisFunction->GetPlatform();
-    std::vector<BinaryNinja::InstructionTextToken> beforeTokens = type->GetTokensBeforeName(platform);
-    std::vector<BinaryNinja::InstructionTextToken> afterTokens = type->GetTokensAfterName(platform);
     BinaryNinja::InstructionTextToken nameToken = {255, TextToken, symbolName};
 
     // Serialize the tokens to make it accessible via QModelIndex.
     // We will take these tokens and then user them in our custom item delegate.
     TokenData tokenData = {};
-    for (const auto &token: beforeTokens)
-        tokenData.tokens.emplace_back(token);
-    tokenData.tokens.emplace_back(255, TextToken, " ");
-    tokenData.tokens.emplace_back(nameToken);
-    for (const auto &token: afterTokens)
-        tokenData.tokens.emplace_back(token);
+
+    // TODO: Make this not look like garbage
+    BinaryNinja::Ref<BinaryNinja::Type> type = m_function->GetType(*analysisFunction);
+    if (type)
+    {
+        BinaryNinja::Ref<BinaryNinja::Platform> platform = analysisFunction->GetPlatform();
+        std::vector<BinaryNinja::InstructionTextToken> beforeTokens = type->GetTokensBeforeName(platform);
+        std::vector<BinaryNinja::InstructionTextToken> afterTokens = type->GetTokensAfterName(platform);
+
+        for (const auto &token: beforeTokens)
+            tokenData.tokens.emplace_back(token);
+        tokenData.tokens.emplace_back(255, TextToken, " ");
+        tokenData.tokens.emplace_back(nameToken);
+        for (const auto &token: afterTokens)
+            tokenData.tokens.emplace_back(token);
+    }
+    else
+    {
+        tokenData.tokens.emplace_back(nameToken);
+    }
+
     setData(QVariant::fromValue(tokenData), Qt::UserRole);
 }