fix(context): load Keys under the mutex in Copy (#4854)

Copy read c.Keys before RLock. Set stores that field under Lock when the
map is created. The race detector reports the unsynchronized access, and
the copy can observe a nil header and drop keys Set has already published.

maps.Clone(nil) returns nil, so the load and the clone belong in the same
critical section. Map iteration was already under the mutex.

Co-authored-by: hazyhaar <hazyhaarlabs@gmail.com>
This commit is contained in:
HazyLab 2026-09-25 08:01:37 +02:00 committed by GitHub
parent 3b08cd7235
commit 1bd0ecf2d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 2 deletions

View File

@ -132,9 +132,8 @@ func (c *Context) Copy() *Context {
cp.handlers = nil
cp.fullPath = c.fullPath
cKeys := c.Keys
c.mu.RLock()
cp.Keys = maps.Clone(cKeys)
cp.Keys = maps.Clone(c.Keys)
c.mu.RUnlock()
cParams := c.Params

View File

@ -709,6 +709,30 @@ func TestContextGetStringMapStringSlice(t *testing.T) {
assert.Equal(t, []string{"foo"}, c.GetStringMapStringSlice("map")["foo"])
}
func TestCopyConcurrentWithSet(t *testing.T) {
c := &Context{}
var wg sync.WaitGroup
wg.Add(2)
go func() {
defer wg.Done()
for i := 0; i < 100; i++ {
c.Set(i, i)
}
}()
go func() {
defer wg.Done()
for i := 0; i < 100; i++ {
cp := c.Copy()
for k, v := range cp.Keys {
if k != v {
t.Errorf("copied key %v = %v, want %v", k, v, k)
}
}
}
}()
wg.Wait()
}
func TestContextCopy(t *testing.T) {
c, _ := CreateTestContext(httptest.NewRecorder())
c.index = 2