]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/link: make Loader.SymName not crash
authorRuss Cox <rsc@golang.org>
Wed, 14 Apr 2021 16:44:04 +0000 (12:44 -0400)
committerRuss Cox <rsc@golang.org>
Fri, 23 Apr 2021 21:43:02 +0000 (21:43 +0000)
Even if not presented with a valid symbol, recover gracefully,
so that debug prints do not crash.

Change-Id: I06bbe4bec5f90b79b4830e772a7fc3d7c919df1b
Reviewed-on: https://go-review.googlesource.com/c/go/+/312036
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
src/cmd/link/internal/loader/loader.go

index 141dd0ac688eb6d725c0602b674cf68c7aa23076..d5331b3fef1dd339cc4961c0e987a39a14fae0bd 100644 (file)
@@ -771,6 +771,9 @@ func (l *Loader) SymName(i Sym) string {
                return pp.name
        }
        r, li := l.toLocal(i)
+       if r == nil {
+               return "?"
+       }
        name := r.Sym(li).Name(r.Reader)
        if !r.NeedNameExpansion() {
                return name