Skip to content

Commit dd20195

Browse files
rolandshoemakergopherbot
authored andcommitted
go/parser: track depth in nested element lists
Prevents stack exhaustion with extremely deeply nested literal values, i.e. field values in structs. Fixes #69138 Fixes CVE-2024-34155 Change-Id: I2e8e33b44105cc169d7ed1ae83fb56df0c10f1ee Reviewed-on: https://go-internal-review.googlesource.com/c/go/+/1520 Reviewed-by: Robert Griesemer <[email protected]> Reviewed-by: Damien Neil <[email protected]> Reviewed-by: Russ Cox <[email protected]> Reviewed-on: https://go-review.googlesource.com/c/go/+/611238 LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Roland Shoemaker <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]>
1 parent 73fa90e commit dd20195

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/go/parser/parser.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,6 +1676,8 @@ func (p *parser) parseElementList() (list []ast.Expr) {
16761676
}
16771677

16781678
func (p *parser) parseLiteralValue(typ ast.Expr) ast.Expr {
1679+
defer decNestLev(incNestLev(p))
1680+
16791681
if p.trace {
16801682
defer un(trace(p, "LiteralValue"))
16811683
}

src/go/parser/parser_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,10 +598,11 @@ var parseDepthTests = []struct {
598598
{name: "chan2", format: "package main; var x «<-chan »int"},
599599
{name: "interface", format: "package main; var x «interface { M() «int» }»", scope: true, scopeMultiplier: 2}, // Scopes: InterfaceType, FuncType
600600
{name: "map", format: "package main; var x «map[int]»int"},
601-
{name: "slicelit", format: "package main; var x = «[]any{«»}»", parseMultiplier: 2}, // Parser nodes: UnaryExpr, CompositeLit
602-
{name: "arraylit", format: "package main; var x = «[1]any{«nil»}»", parseMultiplier: 2}, // Parser nodes: UnaryExpr, CompositeLit
603-
{name: "structlit", format: "package main; var x = «struct{x any}{«nil»}»", parseMultiplier: 2}, // Parser nodes: UnaryExpr, CompositeLit
604-
{name: "maplit", format: "package main; var x = «map[int]any{1:«nil»}»", parseMultiplier: 2}, // Parser nodes: CompositeLit, KeyValueExpr
601+
{name: "slicelit", format: "package main; var x = []any{«[]any{«»}»}", parseMultiplier: 3}, // Parser nodes: UnaryExpr, CompositeLit
602+
{name: "arraylit", format: "package main; var x = «[1]any{«nil»}»", parseMultiplier: 3}, // Parser nodes: UnaryExpr, CompositeLit
603+
{name: "structlit", format: "package main; var x = «struct{x any}{«nil»}»", parseMultiplier: 3}, // Parser nodes: UnaryExpr, CompositeLit
604+
{name: "maplit", format: "package main; var x = «map[int]any{1:«nil»}»", parseMultiplier: 3}, // Parser nodes: CompositeLit, KeyValueExpr
605+
{name: "element", format: "package main; var x = struct{x any}{x: «{«»}»}"},
605606
{name: "dot", format: "package main; var x = «x.»x"},
606607
{name: "index", format: "package main; var x = x«[1]»"},
607608
{name: "slice", format: "package main; var x = x«[1:2]»"},

0 commit comments

Comments
 (0)