diff options
author | David Crawshaw <crawshaw@golang.org> | 2017-10-21 07:29:46 -0400 |
---|---|---|
committer | David Crawshaw <crawshaw@golang.org> | 2017-10-26 15:08:37 +0000 |
commit | 6355d6c7e2e8f4ea4cfd3fed8da6677106937f66 (patch) | |
tree | bd24bb06aa7ebdd7f597d1e563dfef56b784c7a8 /src/plugin | |
parent | 78ea9a71291d61d40a3ad57a801da46bd502c9a8 (diff) | |
download | go-6355d6c7e2e8f4ea4cfd3fed8da6677106937f66.tar.gz go-6355d6c7e2e8f4ea4cfd3fed8da6677106937f66.zip |
cmd/link, plugin: always encode path
Both the linker and the plugin package were inconsistent
about when they applied the path encoding defined in
objabi.PathToPrefix. As a result, only some symbols from
a package path that required encoding were being found.
So always encoding the path.
Fixes #22295
Change-Id: Ife86c79ca20b2e9307008ed83885e193d32b7dc4
Reviewed-on: https://go-review.googlesource.com/72390
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/plugin')
-rw-r--r-- | src/plugin/plugin_dlopen.go | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/plugin/plugin_dlopen.go b/src/plugin/plugin_dlopen.go index 37380989d7..47f2b29a80 100644 --- a/src/plugin/plugin_dlopen.go +++ b/src/plugin/plugin_dlopen.go @@ -49,37 +49,6 @@ func lastIndexByte(s string, c byte) int { return -1 } -// pathToPrefix converts raw string to the prefix that will be used in the symbol -// table. If modifying, modify the version in internal/obj/sym.go as well. -func pathToPrefix(s string) string { - slash := lastIndexByte(s, '/') - // check for chars that need escaping - n := 0 - for r := 0; r < len(s); r++ { - if c := s[r]; c <= ' ' || (c == '.' && r > slash) || c == '%' || c == '"' || c >= 0x7F { - n++ - } - } - - // quick exit - if n == 0 { - return s - } - - // escape - const hex = "0123456789abcdef" - p := make([]byte, 0, len(s)+2*n) - for r := 0; r < len(s); r++ { - if c := s[r]; c <= ' ' || (c == '.' && r > slash) || c == '%' || c == '"' || c >= 0x7F { - p = append(p, '%', hex[c>>4], hex[c&0xF]) - } else { - p = append(p, c) - } - } - - return string(p) -} - func open(name string) (*Plugin, error) { cPath := make([]byte, C.PATH_MAX+1) cRelName := make([]byte, len(name)+1) @@ -153,7 +122,7 @@ func open(name string) (*Plugin, error) { symName = symName[1:] } - fullName := pathToPrefix(pluginpath) + "." + symName + fullName := pluginpath + "." + symName cname := make([]byte, len(fullName)+1) copy(cname, fullName) |