fix possible panic

superseriousbusiness · Jan 19, 2024 · 4c6dee1 · 4c6dee1
1 parent 20dad2f
commit 4c6dee1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/internal/federation/dereferencing/announce.go b/internal/federation/dereferencing/announce.go
@@ -107,19 +107,21 @@ func (d *Dereferencer) EnrichAnnounce(
 		// All good baby.
 
 	case errors.Is(err, db.ErrAlreadyExists):
+		uri := boost.URI
+
 		// DATA RACE! We likely lost out to another goroutine
 		// in a call to db.Put(Status). Look again in DB by URI.
-		boost, err = d.state.DB.GetStatusByURI(ctx, boost.URI)
+		boost, err = d.state.DB.GetStatusByURI(ctx, uri)
 		if err != nil {
-			err = gtserror.Newf(
+			return nil, gtserror.Newf(
 				"error getting boost wrapper status %s from database after race: %w",
-				boost.URI, err,
+				uri, err,
 			)
 		}
 
 	default:
 		// Proper database error.
-		err = gtserror.Newf("db error inserting status: %w", err)
+		return nil, gtserror.Newf("db error inserting status: %w", err)
 	}
 
 	return boost, err