panic if ConnContext returns nil

quic-go · May 13, 2024 · 60d4e96 · 60d4e96
1 parent 6a3d075
commit 60d4e96
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/integrationtests/self/self_suite_test.go b/integrationtests/self/self_suite_test.go
@@ -186,10 +186,12 @@ func getQuicConfig(conf *quic.Config) *quic.Config {
 	}
 	origTracer := conf.Tracer
 	conf.Tracer = func(ctx context.Context, p logging.Perspective, connID quic.ConnectionID) *logging.ConnectionTracer {
-		return logging.NewMultiplexedConnectionTracer(
-			tools.NewQlogConnectionTracer(GinkgoWriter)(ctx, p, connID),
-			origTracer(ctx, p, connID),
-		)
+		tr := origTracer(ctx, p, connID)
+		qlogger := tools.NewQlogConnectionTracer(GinkgoWriter)(ctx, p, connID)
+		if tr == nil {
+			return qlogger
+		}
+		return logging.NewMultiplexedConnectionTracer(qlogger, tr)
 	}
 	return conf
 }

diff --git a/server.go b/server.go
@@ -638,6 +638,9 @@ func (s *baseServer) handleInitialImpl(p receivedPacket, hdr *wire.Header) error
 	var ctx context.Context
 	if s.connContext != nil {
 		ctx = s.connContext()
+		if ctx == nil {
+			panic("quic: ConnContext returned nil")
+		}
 	} else {
 		ctx = context.Background()
 	}