Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2471 from thaJeztah/19.03_backport_fix_bind_panic 

[19.03 backport] fix panic on single-character volumes
This commit is contained in:
Silvin Lubecki 2020-04-30 17:31:35 +02:00 committed by GitHub
parent 7a2de8165b 4ad65fc358
commit 62baa3ce57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/compose/loader/volume.go
View File

@ -111,6 +111,9 @@ func isFilePath(source string) bool {
case '.', '/', '~': case '.', '/', '~':
return true return true
} }
if len([]rune(source)) == 1 {
return false
}
// windows named pipes // windows named pipes
if strings.HasPrefix(source, `\\`) { if strings.HasPrefix(source, `\\`) {

2
cli/compose/loader/volume_test.go
View File

@ -162,6 +162,8 @@ func TestParseVolumeWindowsNamedPipe(t *testing.T) {
func TestIsFilePath(t *testing.T) { func TestIsFilePath(t *testing.T) {
assert.Check(t, !isFilePath("a界")) assert.Check(t, !isFilePath("a界"))
assert.Check(t, !isFilePath("1"))
assert.Check(t, !isFilePath("c"))
} }
// Preserve the test cases for VolumeSplitN // Preserve the test cases for VolumeSplitN