Commit 48825a25 authored by Sean McBride's avatar Sean McBride Committed by Code Review
Browse files

Merge topic 'auto-init-null-deref' into master

eb22e916 Fixed null deref by adding null check.
parents fd7fdb2e eb22e916
...@@ -60,8 +60,11 @@ vtkInteractorStyle::vtkInteractorStyle() ...@@ -60,8 +60,11 @@ vtkInteractorStyle::vtkInteractorStyle()
this->OutlineActor = NULL; this->OutlineActor = NULL;
this->OutlineMapper = vtkPolyDataMapper::New(); this->OutlineMapper = vtkPolyDataMapper::New();
this->OutlineMapper->SetInputConnection( if(this->OutlineMapper && this->Outline)
this->Outline->GetOutputPort()); {
this->OutlineMapper->SetInputConnection(
this->Outline->GetOutputPort());
}
this->PickedRenderer = NULL; this->PickedRenderer = NULL;
this->CurrentProp = NULL; this->CurrentProp = NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment