Merge subbranch 'pv-master'

1ff2651e Merge topic '12278_fix_invalid_memory_accesses' into pv-master
80181b88 Fixed BUG #12278 caused due to invalid memory accesses.

Filtering/vtkDataSetAttributes.cxx

@@ -35,8 +35,10 @@
 
 namespace
 {
-  typedef  vtkstd::vector< vtkStdString* > vtkInternalComponentNameBase;
+  // pair.first it used to indicate if pair.second is valid.
+  typedef  vtkstd::vector<vtkstd::pair<bool, vtkStdString> > vtkInternalComponentNameBase;
 }
+
 class vtkDataSetAttributes::vtkInternalComponentNames : public vtkInternalComponentNameBase {};
 
 vtkStandardNewMacro(vtkDataSetAttributes);
@@ -1489,7 +1491,6 @@ void vtkDataSetAttributes::InternalCopyAllocate(
 {
   vtkAbstractArray* newAA=0;
   vtkDataArray* newDA=0;
-  vtkStdString *compName;
   int i;
 
   // Allocate attributes if any
@@ -1505,10 +1506,10 @@ void vtkDataSetAttributes::InternalCopyAllocate(
         {
         for (unsigned int j=0; j < list.FieldComponentsNames[i]->size(); ++j)
           {
-          compName = list.FieldComponentsNames[i]->at(j);
-          if ( compName )
+          if (list.FieldComponentsNames[i]->at(j).first)
             {
-            newAA->SetComponentName( j, compName->c_str() );
+            newAA->SetComponentName(j,
+              list.FieldComponentsNames[i]->at(j).second.c_str());
             }
           }
         }
@@ -2055,14 +2056,7 @@ void vtkDataSetAttributes::FieldList::ClearFields()
     {
     for (i=0; i<this->NumberOfFields; i++)
       {
-      if ( this->FieldComponentsNames[i] )
-        {
-        for (size_t j=0; j<this->FieldComponentsNames[i]->size(); j++)
-          {
-          delete this->FieldComponentsNames[i]->at(j);
-          }
-        delete this->FieldComponentsNames[i];
-        }
+      delete this->FieldComponentsNames[i];
       }
     delete [] this->FieldComponentsNames;
     this->FieldComponentsNames = 0;
@@ -2103,10 +2097,6 @@ void vtkDataSetAttributes::FieldList::SetField(
   //so we unallocate correctly
   if ( this->FieldComponentsNames[index] )
     {    
-    for (size_t i=0; i<this->FieldComponentsNames[index]->size(); i++)
-      {
-      delete this->FieldComponentsNames[index]->at(i);
-      }
     delete this->FieldComponentsNames[index];
     this->FieldComponentsNames[index] = NULL;    
     }
@@ -2117,14 +2107,16 @@ void vtkDataSetAttributes::FieldList::SetField(
     {    
     this->FieldComponentsNames[index] = 
       new vtkDataSetAttributes::vtkInternalComponentNames();
-    this->FieldComponentsNames[index]->resize( numberOfComponents, NULL );
+    this->FieldComponentsNames[index]->resize(numberOfComponents,
+      vtkstd::pair<bool, vtkStdString>(false, vtkStdString()));
     name = NULL;
     for ( vtkIdType i=0; i < numberOfComponents; ++i)
       {    
       name = aa->GetComponentName(i);  
       if ( name )
         {        
-        this->FieldComponentsNames[index]->at(i) = new vtkStdString(name);
+        this->FieldComponentsNames[index]->at(i) =
+          vtkstd::pair<bool, vtkStdString>(true, name);
         name = NULL;
         }    
       }