Fix bad request trailer panic

valyala · Dec 13, 2021 · 7db0597 · 7db0597
1 parent 4aadf9a
commit 7db0597
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/header.go b/header.go
@@ -2736,7 +2736,11 @@ func (h *RequestHeader) parseHeaders(buf []byte) (int, error) {
 					continue
 				}
 				if caseInsensitiveCompare(s.key, strTrailer) {
-					err = h.SetTrailerBytes(s.value)
+					if nerr := h.SetTrailerBytes(s.value); nerr != nil {
+						if err == nil {
+							err = nerr
+						}
+					}
 					continue
 				}
 			}

diff --git a/http_test.go b/http_test.go
@@ -3,6 +3,7 @@ package fasthttp
 import (
 	"bufio"
 	"bytes"
+	"encoding/base64"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -24,6 +25,11 @@ func TestInvalidTrailers(t *testing.T) {
 	if err == io.EOF {
 		t.Fatal(err)
 	}
+
+	b, _ := base64.StdEncoding.DecodeString("tCAKIDoKCToKICAKCToKICAKCToKIAogOgoJOgogIAoJOgovIC8vOi4KOh0KVFJhSUxlUjo9HT09HQpUUmFJTGVSOicQAApUUmFJTGVSOj0gHSAKCT09HQoKOgoKCgo=")
+	if err := (&Request{}).Read(bufio.NewReader(bytes.NewReader(b))); !strings.Contains(err.Error(), "error when reading request headers: invalid header key") {
+		t.Fatalf("%#v", err)
+	}
 }
 
 func TestResponseEmptyTransferEncoding(t *testing.T) {