23514: EDF 16031 - SMESH freezes

[modules/kernel.git] / src / SALOMEDSImpl / SALOMEDSImpl_AttributeParameter.cxx

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx
index 97584c9fa7e4f80e243261010d2f86b33a9c2581..04d410953e9dd53f7471685de2d238fda4319f45 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -49,8 +49,8 @@ std::string convertString(const std::string& S)
   }
 
   std::string RS(buffer); 
-  delete c;
-  delete buffer;
+  delete [] c;
+  delete [] buffer;
   return RS;
 }
 
@@ -70,8 +70,8 @@ std::string restoreString(const std::string& S)
   }
 
   std::string RS(buffer); 
-  delete c;
-  delete buffer;
+  delete [] c;
+  delete [] buffer;
   return RS;
 }
 
@@ -526,7 +526,7 @@ std::vector<std::string> SALOMEDSImpl_AttributeParameter::GetIDs(const Parameter
   case PT_STRING: {
     if(_strings.size()) {
       anArray.resize(_strings.size());
-      for(std::map<std::string,std::string>::const_iterator p = _strings.begin(); p!= _strings.end(); p++) 
+      for(std::map<std::string,std::string>::const_iterator p = _strings.begin(); p!= _strings.end(); p++, i++) 
         anArray[i] = p->first;
     }
     break;
@@ -534,7 +534,7 @@ std::vector<std::string> SALOMEDSImpl_AttributeParameter::GetIDs(const Parameter
   case PT_REALARRAY: {
     if(_realarrays.size()) {
       anArray.resize(_realarrays.size());
-      for(std::map< std::string, std::vector<double> >::const_iterator p = _realarrays.begin(); p!= _realarrays.end(); p++) 
+      for(std::map< std::string, std::vector<double> >::const_iterator p = _realarrays.begin(); p!= _realarrays.end(); p++, i++) 
         anArray[i] = p->first;
     }
     break;
@@ -542,7 +542,7 @@ std::vector<std::string> SALOMEDSImpl_AttributeParameter::GetIDs(const Parameter
   case PT_INTARRAY: {
     if(_intarrays.size()) {
       anArray.resize(_intarrays.size());
-      for(std::map< std::string, std::vector<int> >::const_iterator p = _intarrays.begin(); p!= _intarrays.end(); p++) 
+      for(std::map< std::string, std::vector<int> >::const_iterator p = _intarrays.begin(); p!= _intarrays.end(); p++, i++) 
         anArray[i] = p->first;
     }
     break;
@@ -550,7 +550,7 @@ std::vector<std::string> SALOMEDSImpl_AttributeParameter::GetIDs(const Parameter
   case PT_STRARRAY: {
     if(_strarrays.size()) {
       anArray.resize(_strarrays.size());
-      for(std::map< std::string, std::vector<std::string> >::const_iterator p = _strarrays.begin(); p!= _strarrays.end(); p++) 
+      for(std::map< std::string, std::vector<std::string> >::const_iterator p = _strarrays.begin(); p!= _strarrays.end(); p++, i++) 
         anArray[i] = p->first;
     }
     break;
@@ -631,7 +631,6 @@ std::string SALOMEDSImpl_AttributeParameter::Save()
   char *tmpBuffer = new char[255];
 
   buffer << _ints.size() << " ";
-
   for(std::map<std::string,int>::const_iterator p = _ints.begin(); p != _ints.end(); p++) {
     buffer << convertString(p->first) << " " << p->second << " ";
   }