From c8844a8555b2b4206965b8e42678aacead782ae1 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Mon, 4 Apr 2022 12:02:08 -0700 Subject: [PATCH] Replace io.LimitReader with http.MaxBytesReader (#5241) Previously we use io.LimitReader to limit the number of bytes from http request. However, there is a subtle difference between io.LimitReader and io.ReadAll as io.LimitReader will return a Reader, not a ReadCloser. As such the behavior will actually be difference in case of error handling (and when to close). This PR changes io.LimitReader to http.MaxBytesReader so that the behavior can be preserved (except the number of bytes). See https://stackoverflow.com/a/52699702 Signed-off-by: Yong Tang --- plugin/pkg/doh/doh.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pkg/doh/doh.go b/plugin/pkg/doh/doh.go index 575ae5369..9d5305b34 100644 --- a/plugin/pkg/doh/doh.go +++ b/plugin/pkg/doh/doh.go @@ -92,7 +92,7 @@ func requestToMsgGet(req *http.Request) (*dns.Msg, error) { } func toMsg(r io.ReadCloser) (*dns.Msg, error) { - buf, err := io.ReadAll(io.LimitReader(r, 65536)) + buf, err := io.ReadAll(http.MaxBytesReader(nil, r, 65536)) if err != nil { return nil, err }