From 7b1a7a9513026a014e0e9f8487fb738a83f20cbe Mon Sep 17 00:00:00 2001
From: Fufu <fufuok@qq.com>
Date: Tue, 15 Feb 2022 14:57:51 +0800
Subject: [PATCH] fix: utils.TrimBytes should trim all content (#1779)

* perf: if all string content should be trimmed, end the loop early

* test: complete test cases for all Trim functions

* fix: utils.TrimBytes should trim all content
---
 utils/bytes.go        |  2 +-
 utils/bytes_test.go   | 27 +++++++++++++++++++++++++++
 utils/strings.go      |  4 ++--
 utils/strings_test.go | 18 ++++++++++++++++++
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/utils/bytes.go b/utils/bytes.go
index 554101385e..8d39a92766 100644
--- a/utils/bytes.go
+++ b/utils/bytes.go
@@ -41,7 +41,7 @@ func TrimLeftBytes(b []byte, cutset byte) []byte {
 // TrimBytes is the equivalent of bytes.Trim
 func TrimBytes(b []byte, cutset byte) []byte {
 	i, j := 0, len(b)-1
-	for ; i < j; i++ {
+	for ; i <= j; i++ {
 		if b[i] != cutset {
 			break
 		}
diff --git a/utils/bytes_test.go b/utils/bytes_test.go
index 3c180daef5..ccae826bfb 100644
--- a/utils/bytes_test.go
+++ b/utils/bytes_test.go
@@ -80,6 +80,15 @@ func Test_TrimRightBytes(t *testing.T) {
 
 	res = TrimRightBytes([]byte("/test"), '/')
 	AssertEqual(t, []byte("/test"), res)
+
+	res = TrimRightBytes([]byte(" "), ' ')
+	AssertEqual(t, 0, len(res))
+
+	res = TrimRightBytes([]byte("  "), ' ')
+	AssertEqual(t, 0, len(res))
+
+	res = TrimRightBytes([]byte(""), ' ')
+	AssertEqual(t, 0, len(res))
 }
 
 func Benchmark_TrimRightBytes(b *testing.B) {
@@ -106,6 +115,15 @@ func Test_TrimLeftBytes(t *testing.T) {
 
 	res = TrimLeftBytes([]byte("test/"), '/')
 	AssertEqual(t, []byte("test/"), res)
+
+	res = TrimLeftBytes([]byte(" "), ' ')
+	AssertEqual(t, 0, len(res))
+
+	res = TrimLeftBytes([]byte("  "), ' ')
+	AssertEqual(t, 0, len(res))
+
+	res = TrimLeftBytes([]byte(""), ' ')
+	AssertEqual(t, 0, len(res))
 }
 
 func Benchmark_TrimLeftBytes(b *testing.B) {
@@ -135,6 +153,15 @@ func Test_TrimBytes(t *testing.T) {
 
 	res = TrimBytes([]byte(".test"), '.')
 	AssertEqual(t, []byte("test"), res)
+
+	res = TrimBytes([]byte(" "), ' ')
+	AssertEqual(t, 0, len(res))
+
+	res = TrimBytes([]byte("  "), ' ')
+	AssertEqual(t, 0, len(res))
+
+	res = TrimBytes([]byte(""), ' ')
+	AssertEqual(t, 0, len(res))
 }
 
 func Benchmark_TrimBytes(b *testing.B) {
diff --git a/utils/strings.go b/utils/strings.go
index 39cc48b0d7..466413af6a 100644
--- a/utils/strings.go
+++ b/utils/strings.go
@@ -38,12 +38,12 @@ func TrimLeft(s string, cutset byte) string {
 // Trim is the equivalent of strings.Trim
 func Trim(s string, cutset byte) string {
 	i, j := 0, len(s)-1
-	for ; i < j; i++ {
+	for ; i <= j; i++ {
 		if s[i] != cutset {
 			break
 		}
 	}
-	for ; i <= j; j-- {
+	for ; i < j; j-- {
 		if s[j] != cutset {
 			break
 		}
diff --git a/utils/strings_test.go b/utils/strings_test.go
index 97002adfd0..ab312617e2 100644
--- a/utils/strings_test.go
+++ b/utils/strings_test.go
@@ -71,6 +71,15 @@ func Test_TrimRight(t *testing.T) {
 
 	res = TrimRight("/test", '/')
 	AssertEqual(t, "/test", res)
+
+	res = TrimRight(" ", ' ')
+	AssertEqual(t, "", res)
+
+	res = TrimRight("  ", ' ')
+	AssertEqual(t, "", res)
+
+	res = TrimRight("", ' ')
+	AssertEqual(t, "", res)
 }
 
 func Benchmark_TrimRight(b *testing.B) {
@@ -97,6 +106,15 @@ func Test_TrimLeft(t *testing.T) {
 
 	res = TrimLeft("test/", '/')
 	AssertEqual(t, "test/", res)
+
+	res = TrimLeft(" ", ' ')
+	AssertEqual(t, "", res)
+
+	res = TrimLeft("  ", ' ')
+	AssertEqual(t, "", res)
+
+	res = TrimLeft("", ' ')
+	AssertEqual(t, "", res)
 }
 
 func Benchmark_TrimLeft(b *testing.B) {