From 0bc50d9d48047269cf7085b6c2de076b5779e505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Oliveirinha?= <joliveirinha@cloudflare.com>
Date: Tue, 16 Aug 2022 11:30:39 +0100
Subject: [PATCH] refactor populate config to not use provided config

---
 config.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/config.go b/config.go
index dbb37315e1d..b9f32e422a7 100644
--- a/config.go
+++ b/config.go
@@ -68,8 +68,9 @@ func populateConfig(config *Config, defaultConnIDLen int) *Config {
 	if len(versions) == 0 {
 		versions = protocol.SupportedVersions
 	}
+	conIDLen := config.ConnectionIDLength
 	if config.ConnectionIDLength == 0 {
-		config.ConnectionIDLength = defaultConnIDLen
+		conIDLen = defaultConnIDLen
 	}
 	handshakeIdleTimeout := protocol.DefaultHandshakeIdleTimeout
 	if config.HandshakeIdleTimeout != 0 {
@@ -109,7 +110,7 @@ func populateConfig(config *Config, defaultConnIDLen int) *Config {
 	}
 	connIDGenerator := config.ConnectionIDGenerator
 	if connIDGenerator == nil {
-		connIDGenerator = &protocol.DefaultConnectionIDGenerator{ConnLen: config.ConnectionIDLength}
+		connIDGenerator = &protocol.DefaultConnectionIDGenerator{ConnLen: conIDLen}
 	}
 
 	return &Config{
@@ -127,7 +128,7 @@ func populateConfig(config *Config, defaultConnIDLen int) *Config {
 		AllowConnectionWindowIncrease:    config.AllowConnectionWindowIncrease,
 		MaxIncomingStreams:               maxIncomingStreams,
 		MaxIncomingUniStreams:            maxIncomingUniStreams,
-		ConnectionIDLength:               config.ConnectionIDLength,
+		ConnectionIDLength:               conIDLen,
 		ConnectionIDGenerator:            connIDGenerator,
 		StatelessResetKey:                config.StatelessResetKey,
 		TokenStore:                       config.TokenStore,