Merge pull request #20 from masa23/main

Fix Index Out of Range Panic in CrLfToLfTransformer
d--j · Dec 28, 2023 · 3268197 · 3268197
2 parents 6cc737f + dba02c6
commit 3268197
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/milterutil/transformer.go b/milterutil/transformer.go
@@ -22,7 +22,6 @@ func (t *CrLfToLfTransformer) Transform(dst, src []byte, atEOF bool) (nDst, nSrc
 		if c == lf {
 			if t.prevCR {
 				nSrc++
-				dst[nDst-1] = lf
 				t.prevCR = false
 				continue
 			}

diff --git a/milterutil/transformer_test.go b/milterutil/transformer_test.go
@@ -93,6 +93,8 @@ func TestCrLfToLfTransformer(t *testing.T) {
 		{[]string{"\r", "\n"}, "\n"},
 		{[]string{"\r\r", "\n"}, "\n\n"},
 		{[]string{stuffing + "123456\r", "\n"}, stuffing + "123456\n"},
+		// regression https://github.com/d--j/go-milter/pull/20
+		{[]string{"aaaaaaaaaaaaaaaaaaaaaaaa\r\naaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\r\nbbbbbbb"}, "aaaaaaaaaaaaaaaaaaaaaaaa\naaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\nbbbbbbb"},
 	})
 }