From 78b7ec0fbe23a5c674401123053d6372ea3ca9c6 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 5 Mar 2019 16:12:34 +0100 Subject: [PATCH] pkg/compiler: fix infinite recursion on unions Found by go-fuzz on fuzzbuzz. --- pkg/compiler/compiler_test.go | 5 ++++- pkg/compiler/types.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/compiler/compiler_test.go b/pkg/compiler/compiler_test.go index 27974f78cf9c..274e2f1cde02 100644 --- a/pkg/compiler/compiler_test.go +++ b/pkg/compiler/compiler_test.go @@ -194,8 +194,11 @@ func TestFuzz(t *testing.T) { "da[", "define\x98define(define\x98define\x98define\x98define\x98define)define\tdefin", "resource g[g]", + `t[ +l t +]`, } - consts := map[string]uint64{"A": 1, "B": 2, "C": 3, "SYS_C": 4} + consts := map[string]uint64{"A": 1, "B": 2, "C": 3, "SYS_A": 4, "SYS_B": 5, "SYS_C": 6} eh := func(pos ast.Pos, msg string) { t.Logf("%v: %v", pos, msg) } diff --git a/pkg/compiler/types.go b/pkg/compiler/types.go index 30ff8884a4d4..8b10e2717265 100644 --- a/pkg/compiler/types.go +++ b/pkg/compiler/types.go @@ -702,7 +702,7 @@ func init() { canBeArg := true for _, fld := range s.Fields { desc := comp.getTypeDesc(fld.Type) - if desc == nil || desc.CanBeArgRet == nil { + if desc == nil || desc == typeStruct || desc.CanBeArgRet == nil { return false, false } canBeArg1, _ := desc.CanBeArgRet(comp, fld.Type)