From: Roger Peppe <rogpeppe@gmail.com>
Date: Wed, 22 Sep 2010 02:58:09 +0000 (-0400)
Subject: strings: fix minor bug in LastIndexFunc
X-Git-Tag: weekly.2010-09-22~15
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8ee986570adeb4216ad340f3fc5ff30311345efe;p=gostls13.git

strings: fix minor bug in LastIndexFunc

R=r, rsc
CC=golang-dev
https://golang.org/cl/2250042
---

diff --git a/src/pkg/strings/strings.go b/src/pkg/strings/strings.go
index 89da9dc224..e3989c7582 100644
--- a/src/pkg/strings/strings.go
+++ b/src/pkg/strings/strings.go
@@ -463,7 +463,7 @@ func lastIndexFunc(s string, f func(r int) bool, truth bool) int {
 				}
 			}
 			if start < 0 {
-				return -1
+				start = 0
 			}
 			var wid int
 			rune, wid = utf8.DecodeRuneInString(s[start:end])
diff --git a/src/pkg/strings/strings_test.go b/src/pkg/strings/strings_test.go
index 3206f5e143..57bc7a3b37 100644
--- a/src/pkg/strings/strings_test.go
+++ b/src/pkg/strings/strings_test.go
@@ -514,6 +514,7 @@ var indexFuncTests = []IndexFuncTest{
 	IndexFuncTest{"\xc0☺\xc0\xc0", not(isValidRune), 0, 5},
 	IndexFuncTest{"ab\xc0a\xc0cd", not(isValidRune), 2, 4},
 	IndexFuncTest{"a\xe0\x80cd", not(isValidRune), 1, 2},
+	IndexFuncTest{"\x80\x80\x80\x80", not(isValidRune), 0, 3},
 }
 
 func TestIndexFunc(t *testing.T) {