Fix segfault when loading a sceme file

[frida/frida.git] / src / core / InformationManager.hxx

diff --git a/src/core/InformationManager.hxx b/src/core/InformationManager.hxx
index 03cb3b866ec139b875ffad8a7556820b3733c2e1..3407113e3324bd14c573a844780ed66926f01557 100644 (file)
--- a/src/core/InformationManager.hxx
+++ b/src/core/InformationManager.hxx
@@ -1,55 +1,89 @@
 #ifndef INCLUDE__InformationManager_hxx
 #define INCLUDE__InformationManager_hxx
 
+#include <log4cxx/logger.h>
 #include <boost/signals2.hpp>
 #include <functional>
 #include <string>
 #include <map>
+#include <vector>
+
+#include "disassembler/Disassembler.hxx"
+
+class Interpreter;
 
-class Disassembler;
 class Function;
 class BasicBlock;
 class Comment;
 
+class RenameFunctionEvent;
+class NewFunctionEvent;
+class ChangeCommentEvent;
+
 class QString;
+class QTemporaryFile;
+class QPluginLoader;
 
-class RenameFunctionEvent;
+using boost::signals2::connection;
 
 class InformationManager {
 public:
+       InformationManager();
        ~InformationManager();
 
        void reset(const std::string& filename);
-       void save(const QString& filename);
-
-       void signal_new_function(Function* f);
-       void signal_new_dyn_symbol(const std::string& f)
-               { new_dyn_symbol_signal(f);     }
-
-       boost::signals2::connection
-       connect_new_function_signal(std::function<void(Function*)> f)
-               { return new_function_signal.connect(f); }
-
-       boost::signals2::connection
-       connect_new_dyn_symbol_signal(std::function<void(const std::string& name)> f)
-               { return new_dyn_symbol_signal.connect(f); }
-
-       boost::signals2::connection
-       connect_reset_signal(std::function<void ()> f)
-               { return reset_signal.connect(f); }
-
-       boost::signals2::connection
-       connect_rename_function_signal(std::function<void (RenameFunctionEvent*)> f)
-               { return rename_function_signal.connect(f); }
+       void load(const std::string& filename);
+       void save(const std::string& filename);
 
        Disassembler* getDisassembler()
                { return disassembler.get(); }
 
+       // Rename Function
+       typedef std::function<void (RenameFunctionEvent*)> RenameFunctionHandler;
+       connection registerRenameFunctionEvent(RenameFunctionHandler h)
+               { return renameFunctionSignal.connect(h); }
        void dispatch(RenameFunctionEvent* event)
-               { rename_function_signal(event); }
+               { renameFunctionSignal(event); }
+
+       // New Function
+       typedef std::function<void (NewFunctionEvent*)> NewFunctionHandler;
+       connection registerNewFunctionEvent(NewFunctionHandler h)
+               { return newFunctionSignal.connect(h); }
+       void dispatch(NewFunctionEvent* event)
+               { newFunctionSignal(event); }
+
+       // Change Comment
+       typedef std::function<void (ChangeCommentEvent*)> ChangeCommentHandler;
+       connection registerChangeCommentEvent(ChangeCommentHandler h)
+               { return changeCommentSignal.connect(h); }
+       void dispatch(ChangeCommentEvent* event)
+               { changeCommentSignal(event); }
+
+       connection connect_reset_signal(std::function<void ()> f)
+               { return reset_signal.connect(f); }
 
        Function* getFunction(uint64_t address);
+       bool hasFunctions() const {return functions.size() != 0;}
+       std::map<uint64_t, Function*>::const_iterator beginFunctions();
+       std::map<uint64_t, Function*>::const_iterator endFunctions();
+
        BasicBlock* getBasicBlock(uint64_t address);
+       bool hasBasicBlocks() const {return blocks.size() != 0;}
+       std::map<uint64_t, BasicBlock*>::const_iterator beginBasicBlocks();
+       std::map<uint64_t, BasicBlock*>::const_iterator endBasicBlocks();
+
+       std::pair<
+               std::multimap<uint64_t, Comment*>::const_iterator,
+               std::multimap<uint64_t, Comment*>::const_iterator>
+       getComments(uint64_t address);
+       bool hasComments() const {return ! comments.empty();}
+       std::multimap<uint64_t,Comment*>::const_iterator beginComments();
+       std::multimap<uint64_t,Comment*>::const_iterator endComments();
+
+       Interpreter* getInterpreter(const std::string& name);
+       bool hasInterpreters() const {return interpreters.size() != 0;}
+       std::map<std::string, Interpreter*>::const_iterator beginInterpreters();
+       std::map<std::string, Interpreter*>::const_iterator endInterpreters();
 
        /* Protocoll:
         *
@@ -71,23 +105,36 @@ public:
         * thingsmay happen.
         */
        Function* newFunction(uint64_t address);
+       Function* newDynamicFunction(uint64_t address);
        BasicBlock* newBasicBlock(uint64_t address);
        Comment* newGlobalComment(uint64_t address);
        Comment* newLocalComment(uint64_t address, Function* f);
        void finishFunction(Function* f);
        void finishBasicBlock(BasicBlock* b);
-       void finnishComment(Comment* c);
+       void finishComment(Comment* c);
        void deleteFunction(Function* f);
        void deleteBasicBlock(BasicBlock* b);
        void deleteComment(Comment* c);
+
 private:
+       boost::signals2::signal<void (RenameFunctionEvent*)> renameFunctionSignal;
+       boost::signals2::signal<void (NewFunctionEvent*)> newFunctionSignal;
+       boost::signals2::signal<void (ChangeCommentEvent*)> changeCommentSignal;
+
        boost::signals2::signal<void ()> reset_signal;
-       boost::signals2::signal<void (Function*)> new_function_signal;
-       boost::signals2::signal<void (const std::string& name)> new_dyn_symbol_signal;
-       boost::signals2::signal<void (RenameFunctionEvent*)> rename_function_signal;
+
        std::unique_ptr<Disassembler> disassembler;
+
+       std::map<std::string, Interpreter*> interpreters;
        std::map<uint64_t, Function*> functions;
        std::map<uint64_t, BasicBlock*> blocks;
+       std::multimap<uint64_t, Comment*> comments;
+
+       std::string filename;
+       std::unique_ptr<QTemporaryFile> tmpfile;
+       std::vector<QPluginLoader*> plugins;
+
+       log4cxx::LoggerPtr logger;
 };
 
 #endif /* INCLUDE__InformationManager_hxx */