phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-04 08:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

tpl: Fix substr when length parameter is zero

Browse source 
When length parameter is zero, always return an empty string.

Updates #7993
This commit is contained in:
Cameron Moore 2020-11-28 09:56:49 -06:00 committed by Bjørn Erik Pedersen
parent 64789fb5dc
commit 5862fd2a60
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tpl/strings/strings.go
View file

@ -327,9 +327,12 @@ func (ns *Namespace) Substr(a interface{}, nums ...interface{}) (string, error)
end := rlen end := rlen
if length < 0 { switch {
case length == 0:
return "", nil
case length < 0:
end += length end += length
} else if length > 0 { case length > 0:
end = start + length end = start + length
} }

5
tpl/strings/strings_test.go
View file

@ -441,6 +441,9 @@ func TestSubstr(t *testing.T) {
}{ }{
{"abc", 1, 2, "bc"}, {"abc", 1, 2, "bc"},
{"abc", 0, 1, "a"}, {"abc", 0, 1, "a"},
{"abcdef", 0, 0, ""},
{"abcdef", 1, 0, ""},
{"abcdef", -1, 0, ""},
{"abcdef", -1, 2, "f"}, {"abcdef", -1, 2, "f"},
{"abcdef", -3, 3, "def"}, {"abcdef", -3, 3, "def"},
{"abcdef", -1, nil, "f"}, {"abcdef", -1, nil, "f"},
@ -488,7 +491,7 @@ func TestSubstr(t *testing.T) {
} }
c.Assert(err, qt.IsNil) c.Assert(err, qt.IsNil)
c.Assert(result, qt.Equals, test.expect, qt.Commentf("%v", test)) c.Check(result, qt.Equals, test.expect, qt.Commentf("%v", test))
} }
_, err = ns.Substr("abcdef") _, err = ns.Substr("abcdef")