Skip to content

Guard recursive embedded XML type discovery #1788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dajiaohuang wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Guard recursive embedded XML type discovery #1788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc2e860
go/ir: avoid canonicalizing function signatures
dajiaohuang Oct 1, 2026
b0abf7b
Guard recursive embedded XML type discovery
dajiaohuang Oct 1, 2026
ea2bfa1
Keep fix independent of generic IR change
dajiaohuang Oct 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion staticcheck/fakexml/typeinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,19 @@ var tinfoMap sync.Map // map[reflect.Type]*typeInfo
// getTypeInfo returns the typeInfo structure with details necessary
// for marshaling and unmarshaling typ.
func getTypeInfo(typ fakereflect.TypeAndCanAddr) (*typeInfo, error) {
return getTypeInfoRecursive(typ, map[fakereflect.TypeAndCanAddr]bool{})
}

func getTypeInfoRecursive(typ fakereflect.TypeAndCanAddr, visiting map[fakereflect.TypeAndCanAddr]bool) (*typeInfo, error) {
if ti, ok := tinfoMap.Load(typ); ok {
return ti.(*typeInfo), nil
}
if visiting[typ] {
// Recursive embedded structs cannot contribute fields indefinitely.
return &typeInfo{}, nil
}
visiting[typ] = true
defer delete(visiting, typ)

tinfo := &typeInfo{}
if typ.IsStruct() && !typeutil.IsTypeWithName(typ.Type, "encoding/xml.Name") {
Expand All @@ -95,7 +105,7 @@ func getTypeInfo(typ fakereflect.TypeAndCanAddr) (*typeInfo, error) {
t = t.Elem()
}
if t.IsStruct() {
inner, err := getTypeInfo(t)
inner, err := getTypeInfoRecursive(t, visiting)
if err != nil {
return nil, err
}
Expand Down
9 changes: 9 additions & 0 deletions staticcheck/sa1026/testdata/go1.0/CheckUnsupportedMarshal/CheckUnsupportedMarshal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ type Recursive struct {
Field *Recursive
}

type RecursiveEmbed struct {
*RecursiveEmbed
}

type ValueMarshaler chan int

func (ValueMarshaler) MarshalText() ([]byte, error) { return nil, nil }
Expand Down Expand Up @@ -316,6 +320,11 @@ func cyclicPointer() {
xml.Marshal(s) //@ diag(`cyclic type P, via x.Foo.Bar`)
}

func cyclicEmbeddedStruct() {
var value RecursiveEmbed
xml.Marshal(value)
}

func functionAsArgument(arg T1) {
// https://staticcheck.io/issues/1660

Expand Down