eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-14 19:59:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

BugFix: interrupting recursive session loading

Browse Source 
Prevent crash on  recursive (infinite) loading of session file (containing itself).
This commit is contained in:
Bruno
2021-02-14 18:56:48 +01:00
parent 25c2bb59f5
commit e37b21760e
11 changed files with 71 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SessionCreator.h
View File

@@ -13,7 +13,7 @@ class SessionLoader : public Visitor {
public:
SessionLoader(Session *session);
SessionLoader(Session *session, uint recursion = 0);
inline Session *session() const { return session_; }
void load(tinyxml2::XMLElement *sessionNode);
@@ -58,6 +58,7 @@ protected:
tinyxml2::XMLElement *xmlCurrent_;
Session *session_;
std::list<uint64_t> sources_id_;
uint recursion_;
static void XMLToNode(tinyxml2::XMLElement *xml, Node &n);
};
@@ -69,7 +70,7 @@ class SessionCreator : public SessionLoader {
void loadConfig(tinyxml2::XMLElement *viewsNode);
public:
SessionCreator();
SessionCreator(uint recursion = 0);
void load(const std::string& filename);