Merge pull request #88611 from cockroachdb/blathers/backport-release-…

…22.1-88532

release-22.1: contention: prevent nil type assertion in event store

pkg/sql/contention/event_store.go

@@ -276,22 +276,26 @@ func (s *eventStore) ForEachEvent(
 			// getting the event. In this case we simply ignore it.
 			continue
 		}
-		if err := op(&event); err != nil {
+		if err := op(event); err != nil {
 			return err
 		}
 	}
-
 	return nil
 }
 
 func (s *eventStore) getEventByEventHash(
 	hash uint64,
-) (_ contentionpb.ExtendedContentionEvent, ok bool) {
+) (_ *contentionpb.ExtendedContentionEvent, ok bool) {
 	s.mu.RLock()
 	defer s.mu.RUnlock()
-
-	event, ok := s.mu.store.Get(hash)
-	return event.(contentionpb.ExtendedContentionEvent), ok
+	var contentionEvent contentionpb.ExtendedContentionEvent
+	var event interface{}
+	if event, ok = s.mu.store.Get(hash); ok {
+		if contentionEvent, ok = event.(contentionpb.ExtendedContentionEvent); ok {
+			return &contentionEvent, ok
+		}
+	}
+	return nil, ok
 }
 
 // flushAndResolve is the main method called by the resolver goroutine each