Merge pull request #1294 from hashicorp/b-task-runner-panic

Guard against restoring a nil task in task_runner
hashicorp · Jun 16, 2016 · eb9a986 · eb9a986
2 parents d1df351 + 041e6eb
commit eb9a986
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/client/task_runner.go b/client/task_runner.go
@@ -146,7 +146,13 @@ func (r *TaskRunner) RestoreState() error {
 	}
 
 	// Restore fields
-	r.task = snap.Task
+	if snap.Task == nil {
+		err := fmt.Errorf("task runner snapshot include nil Task")
+		r.logger.Printf("[ERR] client: %v", err)
+		return err
+	} else {
+		r.task = snap.Task
+	}
 	r.artifactsDownloaded = snap.ArtifactDownloaded
 
 	if err := r.setTaskEnv(); err != nil {