Changeset 6402

Timestamp:

Dec 22, 2009, 10:49:25 PM (15 years ago)

Author:

rgrieder

Message:

Protected ClassTreeMask functions against NULL identifiers.

That can happen for instance in the following situation:
this→targetMask_.exclude(ClassByString("MyClass"));
If MyClass doesn't exist you shouldn't get a segfault anymore.

File:

• code/branches/presentation2/src/libraries/core/ClassTreeMask.cc (modified) (4 diffs)

code/branches/presentation2/src/libraries/core/ClassTreeMask.cc

@@ -291 +291 @@
     void ClassTreeMask::add(const Identifier* subclass, bool bInclude, bool overwrite, bool clean)
     {
+        if (!subclass)
+            return;
         // Check if the given subclass is a child of our root-class
         if (subclass->isA(this->root_->getClass()))
@@ -320 +322 @@
     void ClassTreeMask::add(ClassTreeMaskNode* node, const Identifier* subclass, bool bInclude, bool overwrite)
     {
+        if (!subclass)
+            return;
         // Check if the current node contains exactly the subclass we want to add
         if (subclass == node->getClass())
@@ -395 +399 @@
     void ClassTreeMask::addSingle(const Identifier* subclass, bool bInclude, bool clean)
     {
+        if (!subclass)
+            return;
         for (std::set<const Identifier*>::const_iterator it = subclass->getDirectChildrenBegin(); it != subclass->getDirectChildrenEnd(); ++it)
             this->add(*it, this->isIncluded(*it), false, false);
@@ -428 +434 @@
     bool ClassTreeMask::isIncluded(ClassTreeMaskNode* node, const Identifier* subclass) const
     {
+        if (!subclass)
+            return false;
         // Check if the searched subclass is of the same type as the class in the current node or a derivative
         if (subclass->isA(node->getClass()))