mirror of
https://github.com/golang/go
synced 2024-11-19 13:44:52 -07:00
plugin: resolve random crash when calling exported functions
open modified the plugin symbols map while ranging over it. This is normally harmless, except that the operations performed were not idempotent leading to function pointers being corrupted. Fixes #19269 Change-Id: I4b6eb1d45567161412e4a34b41f1ebf647bcc942 Reviewed-on: https://go-review.googlesource.com/40431 Run-TryBot: Todd Neal <todd@tneal.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: David Crawshaw <crawshaw@golang.org>
This commit is contained in:
parent
092405a9af
commit
758d078fd5
@ -82,7 +82,6 @@ func open(name string) (*Plugin, error) {
|
||||
p := &Plugin{
|
||||
pluginpath: pluginpath,
|
||||
loaded: make(chan struct{}),
|
||||
syms: syms,
|
||||
}
|
||||
plugins[filepath] = p
|
||||
pluginsMu.Unlock()
|
||||
@ -97,13 +96,13 @@ func open(name string) (*Plugin, error) {
|
||||
}
|
||||
|
||||
// Fill out the value of each plugin symbol.
|
||||
updatedSyms := map[string]interface{}{}
|
||||
for symName, sym := range syms {
|
||||
isFunc := symName[0] == '.'
|
||||
if isFunc {
|
||||
delete(syms, symName)
|
||||
symName = symName[1:]
|
||||
}
|
||||
|
||||
cname := C.CString(pluginpath + "." + symName)
|
||||
p := C.pluginLookup(h, cname, &cErr)
|
||||
C.free(unsafe.Pointer(cname))
|
||||
@ -116,8 +115,12 @@ func open(name string) (*Plugin, error) {
|
||||
} else {
|
||||
(*valp)[1] = p
|
||||
}
|
||||
syms[symName] = sym
|
||||
// we can't add to syms during iteration as we'll end up processing
|
||||
// some symbols twice with the inability to tell if the symbol is a function
|
||||
updatedSyms[symName] = sym
|
||||
}
|
||||
p.syms = updatedSyms
|
||||
|
||||
close(p.loaded)
|
||||
return p, nil
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user