dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-09 09:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #53281 from thaJeztah/fix_stackoverflow

Browse Source 
daemon/pkg/opts: fix recursive NRI JSON decoding on go1.27 (JSON v2)
This commit is contained in:
Paweł Gronowski
2026-08-03 17:17:57 +02:00
committed by GitHub
parent d096010b67 7067ffff11
commit 021b11c1da
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/pkg/opts/nri_opts.go
View File

@@ -19,11 +19,8 @@ type NRIOpts struct {
func (c *NRIOpts) UnmarshalJSON(raw []byte) error {
dec := json.NewDecoder(bytes.NewReader(raw))
dec.DisallowUnknownFields()
type nc *NRIOpts // prevent recursion
if err := dec.Decode(nc(c)); err != nil {
return err
}
return nil
type nriOpts NRIOpts // prevent recursion
return dec.Decode((*nriOpts)(c))
}
// NamedNRIOpts is a NamedOption and flags.Value for NRI configuration parsing.