fix:连续的两个回车符处理不当，后一个回车符没被过滤掉

3th1nk · Feb 19, 2024 · 04b6415 · 04b6415
1 parent 0ece4e2
commit 04b6415
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/filter/crlf.go b/pkg/filter/crlf.go
@@ -21,7 +21,7 @@ func CrlfFilter(s []byte) []byte {
 		// 清除\r及其左侧的当前行内容
 		if index := bytes.LastIndexByte(s[:pos], '\n'); index >= 0 {
 			length -= dropBytes(s, index+1, pos+1)
-			pos = index + 2
+			pos = index + 1
 		} else {
 			s = s[pos+1:]
 			length -= pos + 1

diff --git a/pkg/filter/crlf_test.go b/pkg/filter/crlf_test.go
@@ -6,8 +6,8 @@ import (
 )
 
 func Test_carriageReturnFilter(t *testing.T) {
-	src := []byte{0x32, 0x33, 0x35, 0x0D, 0x0D, 0x0A}
-	expect := []byte{0x0A}
+	src := []byte{0x32, 0x0A, 0x33, 0x35, 0x0D, 0x0D, 0x36, 0x0D, 0x0A}
+	expect := []byte{0x32, 0x0A, 0x36, 0x0A}
 	dst := CrlfFilter(src)
 	assert.Equal(t, expect, dst)
 }