Skip to content

fix: allOf cycle detection oversight #2316

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

Merged
mromaszewicz merged 1 commit into from
Apr 11, 2026
Merged

fix: allOf cycle detection oversight #2316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions pkg/codegen/merge_schemas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ func mergeSchemas(allOf []*openapi3.SchemaRef, path []string) (Schema, error) {
return Schema{}, err
}

// Seed allOf[0]'s ref so that if s1's own AllOf contains a back-reference
// to itself, the cycle is detected during recursive merging.
seenTopLevel := make(map[string]bool)
if allOf[0].Ref != "" {
seenTopLevel[allOf[0].Ref] = true
}

for i := 1; i < n; i++ {
var err error
oneOfSchema, err := valueWithPropagatedRef(allOf[i])
Expand All @@ -40,8 +47,12 @@ func mergeSchemas(allOf []*openapi3.SchemaRef, path []string) (Schema, error) {
}

seenSchemaRef := make(map[string]bool)
for k := range seenTopLevel {
seenSchemaRef[k] = true
}
if allOf[i].Ref != "" {
seenSchemaRef[allOf[i].Ref] = true
seenTopLevel[allOf[i].Ref] = true
}
schema, err = mergeOpenapiSchemas(schema, oneOfSchema, true, seenSchemaRef)
if err != nil {
Expand Down
Loading