Merge topic 'print-uninitialized-classes' into release

1e3d0cf5 Fix PrintSelf method call with uninitialized objects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mathieu Westphal <mathieu.westphal@kitware.com>
Merge-request: !6801

Common/DataModel/vtkUnstructuredGridCellIterator.cxx

@@ -33,20 +33,55 @@ void vtkUnstructuredGridCellIterator::PrintSelf(ostream& os, vtkIndent indent)
 {
   this->Superclass::PrintSelf(os, indent);
 
-  os << indent << "Cells:\n";
-  this->Cells->PrintSelf(os, indent.GetNextIndent());
+  if (this->Cells)
+  {
+    os << indent << "Cells:\n";
+    this->Cells->PrintSelf(os, indent.GetNextIndent());
+  }
+  else
+  {
+    os << indent << "Cells: (none)" << endl;
+  }
 
-  os << indent << "Types:\n";
-  this->Types->PrintSelf(os, indent.GetNextIndent());
+  if (this->Types)
+  {
+    os << indent << "Types:\n";
+    this->Types->PrintSelf(os, indent.GetNextIndent());
+  }
+  else
+  {
+    os << indent << "Types: (none)" << endl;
+  }
 
-  os << indent << "FaceConn:\n";
-  this->FaceConn->PrintSelf(os, indent.GetNextIndent());
+  if (this->FaceConn)
+  {
+    os << indent << "FaceConn:\n";
+    this->FaceConn->PrintSelf(os, indent.GetNextIndent());
+  }
+  else
+  {
+    os << indent << "FaceConn: (none)" << endl;
+  }
 
-  os << indent << "FaceLocs:\n";
-  this->FaceLocs->PrintSelf(os, indent.GetNextIndent());
+  if (this->FaceLocs)
+  {
+    os << indent << "FaceLocs:\n";
+    this->FaceLocs->PrintSelf(os, indent.GetNextIndent());
+  }
+  else
+  {
+    os << indent << "FaceLocs: (none)" << endl;
+  }
 
-  os << indent << "Coords:\n";
-  this->Coords->PrintSelf(os, indent.GetNextIndent());
+  if (this->Coords)
+  {
+    os << indent << "Coords:\n";
+    this->Coords->PrintSelf(os, indent.GetNextIndent());
+  }
+  else
+  {
+    os << indent << "Coords: (none)" << endl;
+  }
 }
 
 //------------------------------------------------------------------------------

Filters/Parallel/vtkPTextureMapToSphere.cxx

@@ -67,5 +67,13 @@ void vtkPTextureMapToSphere::PrintSelf(ostream& os, vtkIndent indent)
 {
   this->Superclass::PrintSelf(os, indent);
 
-  os << indent << "Controller: " << *this->Controller << std::endl;
+  if (this->Controller)
+  {
+    os << indent << "Controller:\n";
+    this->Controller->PrintSelf(os, indent.GetNextIndent());
+  }
+  else
+  {
+    os << indent << "Controller: (none)" << endl;
+  }
 }

Filters/Texture/vtkScalarsToTextureFilter.cxx

@@ -41,9 +41,17 @@ void vtkScalarsToTextureFilter::PrintSelf(ostream& os, vtkIndent indent)
 {
   this->Superclass::PrintSelf(os, indent);
   os << indent << "Texture dimensions: " << this->TextureDimensions[0] << "x"
-     << this->TextureDimensions[1] << '\n'
-     << indent << "Transfer function:\n";
-  this->TransferFunction->PrintSelf(os, indent.GetNextIndent());
+     << this->TextureDimensions[1] << '\n';
+
+  if (this->TransferFunction)
+  {
+    os << indent << "Transfer function:\n";
+    this->TransferFunction->PrintSelf(os, indent.GetNextIndent());
+  }
+  else
+  {
+    os << indent << "Transfer function: (none)" << endl;
+  }
 }
 
 //-----------------------------------------------------------------------------

IO/AMR/vtkAMReXGridReader.cxx

@@ -65,20 +65,30 @@ vtkAMReXGridReader::~vtkAMReXGridReader()
 void vtkAMReXGridReader::PrintSelf(ostream& os, vtkIndent indent)
 {
   this->Superclass::PrintSelf(os, indent);
-  os << indent << "FileName: " << this->FileName << endl;
-  if (this->Internal)
+
+  if (this->FileName)
+  {
+    os << indent << "FileName: " << this->FileName << endl;
+  }
+  else
+  {
+    os << indent << "FileName: (none)" << endl;
+  }
+
+  if (this->Internal->Header)
   {
     os << indent << "Header: " << endl;
     this->Internal->Header->PrintSelf(os, indent.GetNextIndent());
-    os << indent << "LevelHeader(s): " << endl;
-    for (int cc = 0; cc < GetNumberOfLevels() + 1; ++cc)
-    {
-      this->Internal->LevelHeader[cc]->PrintSelfLevelHeader(os, indent.GetNextIndent());
-    }
   }
   else
   {
-    os << indent << "Internal: nullptr" << endl;
+    os << indent << "Header: (none)" << endl;
+  }
+
+  os << indent << "LevelHeader(s): " << (this->GetNumberOfLevels() >= 0 ? "" : "(none)") << endl;
+  for (int cc = 0; cc < GetNumberOfLevels() + 1; ++cc)
+  {
+    this->Internal->LevelHeader[cc]->PrintSelfLevelHeader(os, indent.GetNextIndent());
   }
 }