Merge pull request percona#54 from zanjie/master

fix fi overflow cause index out of range panic
junli0411 · May 11, 2020 · cd2547b · cd2547b
2 parents ad5b035 + 30c3368
commit cd2547b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/query/query.go b/query/query.go
@@ -530,7 +530,7 @@ func Fingerprint(q string) string {
 				if Debug {
 					fmt.Println("Lost in space")
 				}
-				if fi > 0 && !isSpace(rune(f[fi-1])) {
+				if fi <= len(f)-1 && fi > 0 && !isSpace(rune(f[fi-1])) {
 					if Debug {
 						fmt.Println("Add space")
 					}
@@ -772,7 +772,7 @@ func Fingerprint(q string) string {
 				addSpace = false
 				s = inValues
 				sqlState = inValues
-			} else if addSpace {
+			} else if addSpace && fi <= len(f)-1 {
 				if Debug {
 					fmt.Println("Add space")
 				}

diff --git a/query/query_test.go b/query/query_test.go
@@ -555,6 +555,20 @@ func TestFingerprintPanicChallenge2(t *testing.T) {
 		"select ? ? ? ? from kamil",
 		query.Fingerprint(q),
 	)
+
+	q = "delete from db.table where col1 in(1) and col2=1"
+	assert.Equal(
+		t,
+		"delete from db.table where col1 in(?+) and col2=?",
+		query.Fingerprint(q),
+	)
+
+	q = "delete from db.table where col1 in(1) and col2=1;"
+	assert.Equal(
+		t,
+		"delete from db.table where col1 in(?+) and col2=?;",
+		query.Fingerprint(q),
+	)
 }
 
 func TestFingerprintDashesInNames(t *testing.T) {