Merge pull request #2471 from thaJeztah/19.03_backport_fix_bind_panic

[19.03 backport] fix panic on single-character volumes
docker · Apr 30, 2020 · 62baa3c · 62baa3c
2 parents 7a2de81 + 4ad65fc
commit 62baa3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/cli/compose/loader/volume.go b/cli/compose/loader/volume.go
@@ -111,6 +111,9 @@ func isFilePath(source string) bool {
 	case '.', '/', '~':
 		return true
 	}
+	if len([]rune(source)) == 1 {
+		return false
+	}
 
 	// windows named pipes
 	if strings.HasPrefix(source, `\\`) {

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