Fix Unicode issue in Slicestr and Substr

Fixes #1333

diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go
index c3c0c50aa83653db1855ade83553d6ce84f0e754..041f954b6343b0918172e5e303ac5f0b619b3263 100644 (file)
--- a/tpl/template_funcs.go
+++ b/tpl/template_funcs.go
@@ -141,19 +141,21 @@ func Slicestr(a interface{}, startEnd ...int) (string, error) {
                return "", errors.New("too many arguments")
        }
 
-       if len(startEnd) > 0 && (startEnd[0] < 0 || startEnd[0] >= len(aStr)) {
+       asRunes := []rune(aStr)
+
+       if len(startEnd) > 0 && (startEnd[0] < 0 || startEnd[0] >= len(asRunes)) {
                return "", errors.New("slice bounds out of range")
        }
 
        if len(startEnd) == 2 {
-               if startEnd[1] < 0 || startEnd[1] > len(aStr) {
+               if startEnd[1] < 0 || startEnd[1] > len(asRunes) {
                        return "", errors.New("slice bounds out of range")
                }
-               return aStr[startEnd[0]:startEnd[1]], nil
+               return string(asRunes[startEnd[0]:startEnd[1]]), nil
        } else if len(startEnd) == 1 {
-               return aStr[startEnd[0]:], nil
+               return string(asRunes[startEnd[0]:]), nil
        } else {
-               return aStr[:], nil
+               return string(asRunes[:]), nil
        }
 
 }
@@ -194,6 +196,8 @@ func Substr(a interface{}, nums ...interface{}) (string, error) {
                }
        }
 
+       asRunes := []rune(aStr)
+
        switch len(nums) {
        case 0:
                return "", errors.New("too less arguments")
@@ -201,7 +205,7 @@ func Substr(a interface{}, nums ...interface{}) (string, error) {
                if start, err = toInt(nums[0], "start argument must be integer"); err != nil {
                        return "", err
                }
-               length = len(aStr)
+               length = len(asRunes)
        case 2:
                if start, err = toInt(nums[0], "start argument must be integer"); err != nil {
                        return "", err
@@ -213,10 +217,10 @@ func Substr(a interface{}, nums ...interface{}) (string, error) {
                return "", errors.New("too many arguments")
        }
 
-       if start < -len(aStr) {
+       if start < -len(asRunes) {
                start = 0
        }
-       if start > len(aStr) {
+       if start > len(asRunes) {
                return "", errors.New(fmt.Sprintf("start position out of bounds for %d-byte string", len(aStr)))
        }
 
@@ -225,24 +229,24 @@ func Substr(a interface{}, nums ...interface{}) (string, error) {
                s = start
                e = start + length
        } else if start < 0 && length >= 0 {
-               s = len(aStr) + start - length + 1
-               e = len(aStr) + start + 1
+               s = len(asRunes) + start - length + 1
+               e = len(asRunes) + start + 1
        } else if start >= 0 && length < 0 {
                s = start
-               e = len(aStr) + length
+               e = len(asRunes) + length
        } else {
-               s = len(aStr) + start
-               e = len(aStr) + length
+               s = len(asRunes) + start
+               e = len(asRunes) + length
        }
 
        if s > e {
                return "", errors.New(fmt.Sprintf("calculated start position greater than end position: %d > %d", s, e))
        }
-       if e > len(aStr) {
-               e = len(aStr)
+       if e > len(asRunes) {
+               e = len(asRunes)
        }
 
-       return aStr[s:e], nil
+       return string(asRunes[s:e]), nil
 
 }
 

diff --git a/tpl/template_funcs_test.go b/tpl/template_funcs_test.go
index f04cadeefb02ec0e5be59f7903df84345c0e9966..633d6e4d53faadf3b2da8697226a067daf59d028 100644 (file)
--- a/tpl/template_funcs_test.go
+++ b/tpl/template_funcs_test.go
@@ -368,6 +368,7 @@ func TestSlicestr(t *testing.T) {
                {"abcdef", []int{-1, 7}, false},
                {"abcdef", []int{1, -1}, false},
                {tstNoStringer{}, []int{0, 1}, false},
+               {"ĀĀĀ", []int{0, 1}, "Ā"}, // issue #1333
        } {
                result, err := Slicestr(this.v1, this.v2...)
 
@@ -422,6 +423,7 @@ func TestSubstr(t *testing.T) {
                {"abcdef", 2.0, nil, false},
                {"abcdef", 2.0, 2, false},
                {"abcdef", 2, 2.0, false},
+               {"ĀĀĀ", 1, 2, "ĀĀ"}, // # issue 1333
        } {
                var result string
                n = i