Merge pull request #2471 from thaJeztah/19.03_backport_fix_bind_panic

silvin-lubecki · web-flow · commit 7068179001f5 · 2020-04-30T17:31:35.000+02:00
[19.03 backport] fix panic on single-character volumes
Upstream-commit: 62baa3ce57a25f98366ca056c306492373658ace
Component: cli
diff --git a/components/cli/cli/compose/loader/volume.go b/components/cli/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/components/cli/cli/compose/loader/volume_test.go b/components/cli/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

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,9 @@ func isFilePath(source string) bool {`
`111`	`111`	`case '.', '/', '~':`
`112`	`112`	`return true`
`113`	`113`	`}`
	`114`	`+ if len([]rune(source)) == 1 {`
	`115`	`+ return false`
	`116`	`+ }`
`114`	`117`
`115`	`118`	`// windows named pipes`
`116`	`119`	if strings.HasPrefix(source, `\\`) {
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,8 @@ func TestParseVolumeWindowsNamedPipe(t *testing.T) {`
`162`	`162`
`163`	`163`	`func TestIsFilePath(t *testing.T) {`
`164`	`164`	`assert.Check(t, !isFilePath("a界"))`
	`165`	`+ assert.Check(t, !isFilePath("1"))`
	`166`	`+ assert.Check(t, !isFilePath("c"))`
`165`	`167`	`}`
`166`	`168`
`167`	`169`	`// Preserve the test cases for VolumeSplitN`