Metrics: Nil Derefence when TR/PR not found

We derefence a nil pointer when TR/PR is not found or somehow taskrun or pipelinerun pointer is nil.
tektoncd · Aug 29, 2022 · a5f9958 · a5f9958
1 parent 31644db
commit a5f9958
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/reconciler/pipelinerun/pipelinerun.go b/pkg/reconciler/pipelinerun/pipelinerun.go
@@ -262,8 +262,9 @@ func (c *Reconciler) durationAndCountMetrics(ctx context.Context, pr *v1beta1.Pi
 		if err != nil && !kerrors.IsNotFound(err) {
 			logger.Errorf("Error getting PipelineRun %s when updating metrics: %w", pr.Name, err)
 			return
-		} else if kerrors.IsNotFound(err) {
+		} else if kerrors.IsNotFound(err) || newPr == nil {
 			logger.Debugf("Pipelinerun %s not found when updating metrics: %w", pr.Name, err)
+			return
 		}
 
 		before := newPr.Status.GetCondition(apis.ConditionSucceeded)

diff --git a/pkg/reconciler/taskrun/taskrun.go b/pkg/reconciler/taskrun/taskrun.go
@@ -221,8 +221,9 @@ func (c *Reconciler) durationAndCountMetrics(ctx context.Context, tr *v1beta1.Ta
 		if err != nil && !k8serrors.IsNotFound(err) {
 			logger.Errorf("Error getting TaskRun %s when updating metrics: %w", tr.Name, err)
 			return
-		} else if k8serrors.IsNotFound(err) {
+		} else if k8serrors.IsNotFound(err) || newTr == nil {
 			logger.Debugf("TaskRun %s not found when updating metrics: %w", tr.Name, err)
+			return
 		}
 
 		before := newTr.Status.GetCondition(apis.ConditionSucceeded)