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

Merge pull request #3670 from thaJeztah/fix_quotes_panic 

opts: fix potential panic in trimQuotes
This commit is contained in:
Sebastiaan van Stijn 2022-06-30 20:56:09 +02:00 committed by GitHub
parent 05d288eb06 a51ea675b2
commit 2280a9d5a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opts/quotedstring.go
View File

@ -22,6 +22,9 @@ func (s *QuotedString) String() string {
} }
func trimQuotes(value string) string { func trimQuotes(value string) string {
if len(value) < 2 {
return value
}
lastIndex := len(value) - 1 lastIndex := len(value) - 1
for _, char := range []byte{'\'', '"'} { for _, char := range []byte{'\'', '"'} {
if value[0] == char && value[lastIndex] == char { if value[0] == char && value[lastIndex] == char {

10
opts/quotedstring_test.go
View File

@ -28,3 +28,13 @@ func TestQuotedStringSetWithNoQuotes(t *testing.T) {
assert.NilError(t, qs.Set("something")) assert.NilError(t, qs.Set("something"))
assert.Check(t, is.Equal("something", qs.String())) assert.Check(t, is.Equal("something", qs.String()))
} }
func TestQuotedStringShort(t *testing.T) {
value := ""
qs := NewQuotedString(&value)
assert.NilError(t, qs.Set(`"`))
assert.Check(t, is.Equal(`"`, qs.String()))
assert.NilError(t, qs.Set(`'`))
assert.Check(t, is.Equal(`'`, qs.String()))
}