Changeset 957 for XIOS/trunk/src/node/file.cpp

Timestamp:

09/30/16 15:28:05 (8 years ago)

Author:

rlacroix

Message:

Fix a possible crash caused by an infinite recursion.

The way virtual groups were handled could cause id clashes which lead to have groups containing themselves.

File:

• XIOS/trunk/src/node/file.cpp (modified) (4 diffs)

XIOS/trunk/src/node/file.cpp

@@ -26 +26 @@
       , allDomainEmpty(false), isOpen(false)
    {
-     setVirtualFieldGroup();
-     setVirtualVariableGroup();
+     setVirtualFieldGroup(CFieldGroup::create(getId() + "_virtual_field_group"));
+     setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group"));
    }
 
@@ -35 +35 @@
       , allDomainEmpty(false), isOpen(false)
     {
-      setVirtualFieldGroup();
-      setVirtualVariableGroup();
+      setVirtualFieldGroup(CFieldGroup::create(getId() + "_virtual_field_group"));
+      setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group"));
     }
 
@@ -187 +187 @@
    {
       this->vVariableGroup = newVVariableGroup;
-   }
-
-   //----------------------------------------------------------------
-   //! Create virtual field group, which is done normally on initializing file
-   void CFile::setVirtualFieldGroup(void)
-   {
-      this->setVirtualFieldGroup(CFieldGroup::create());
-   }
-
-   //! Create virtual variable group, which is done normally on initializing file
-   void CFile::setVirtualVariableGroup(void)
-   {
-      this->setVirtualVariableGroup(CVariableGroup::create());
    }
 
@@ -944 +931 @@
    void CFile::sendAddAllVariables()
    {
-     if (!getAllVariables().empty())
+     std::vector<CVariable*> allVar = getAllVariables();
+     std::vector<CVariable*>::const_iterator it = allVar.begin();
+     std::vector<CVariable*>::const_iterator itE = allVar.end();
+
+     for (; it != itE; ++it)
      {
-       // Firstly, it's necessary to add virtual variable group
-       sendAddVariableGroup(getVirtualVariableGroup()->getId());
-
-       // Okie, now we can add to this variable group
-       std::vector<CVariable*> allVar = getAllVariables();
-       std::vector<CVariable*>::const_iterator it = allVar.begin();
-       std::vector<CVariable*>::const_iterator itE = allVar.end();
-
-       for (; it != itE; ++it)
-       {
-         this->sendAddVariable((*it)->getId());
-         (*it)->sendAllAttributesToServer();
-         (*it)->sendValue();
-       }
+       this->sendAddVariable((*it)->getId());
+       (*it)->sendAllAttributesToServer();
+       (*it)->sendValue();
      }
    }