lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: gapi: Fix a very rare nil pointer issue

Browse Source 
This only showed up while debugging a bug I caused, but technically if
we fail in Init() then we could hit this nil pointer condition.
This commit is contained in:
James Shubin
2024-03-05 21:42:15 -05:00
parent b85f81d529
commit d412d6502d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lang/gapi/gapi.go
View File

@@ -442,7 +442,7 @@ func (obj *GAPI) LangInit() error {
// the lang always tries to load from this standard path: /metadata.yaml // the lang always tries to load from this standard path: /metadata.yaml
input := "/" + interfaces.MetadataFilename // path in remote fs input := "/" + interfaces.MetadataFilename // path in remote fs
obj.lang = &lang.Lang{ lang := &lang.Lang{
Fs: fs, Fs: fs,
FsURI: obj.InputURI, FsURI: obj.InputURI,
Input: input, Input: input,
@@ -456,9 +456,10 @@ func (obj *GAPI) LangInit() error {
obj.data.Logf(Name+": "+format, v...) obj.data.Logf(Name+": "+format, v...)
}, },
} }
if err := obj.lang.Init(); err != nil { if err := lang.Init(); err != nil {
return errwrap.Wrapf(err, "can't init the lang") return errwrap.Wrapf(err, "can't init the lang")
} }
obj.lang = lang // once we can't fail, store the struct...
// XXX: I'm certain I've probably got a deadlock or race somewhere here // XXX: I'm certain I've probably got a deadlock or race somewhere here
// or in lib/main.go so we'll fix it with an API fixup and rewrite soon // or in lib/main.go so we'll fix it with an API fixup and rewrite soon