starred/godoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-25 10:18:59 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

fix(middleware): properly release buffer on error and not to reuse content for bytes.Buffer

Browse Source
This commit is contained in:
yusing
2025-10-26 23:16:38 +08:00
parent a3c82209c6
commit baf774f927
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/net/gphttp/middleware/modify_html.go
View File

@@ -52,13 +52,13 @@ func (m *modifyHTML) modifyResponse(resp *http.Response) error {
// NOTE: do not put it in the defer, it will be used as resp.Body // NOTE: do not put it in the defer, it will be used as resp.Body
content, release, err := httputils.ReadAllBody(resp) content, release, err := httputils.ReadAllBody(resp)
resp.Body.Close()
if err != nil { if err != nil {
log.Err(err).Str("url", fullURL(resp.Request)).Msg("failed to read response body") log.Err(err).Str("url", fullURL(resp.Request)).Msg("failed to read response body")
resp.Body.Close() release(content)
resp.Body = eofReader{} resp.Body = eofReader{}
return err return err
} }
resp.Body.Close()
doc, err := goquery.NewDocumentFromReader(bytes.NewReader(content)) doc, err := goquery.NewDocumentFromReader(bytes.NewReader(content))
if err != nil { if err != nil {
@@ -83,7 +83,11 @@ func (m *modifyHTML) modifyResponse(resp *http.Response) error {
ele.First().AppendHtml(m.HTML) ele.First().AppendHtml(m.HTML)
} }
buf := bytes.NewBuffer(content[:0]) // should not use content (from sized pool) directly for bytes.Buffer
buf := m.bytesPool.GetBuffer()
buf.Write(content)
release(content)
err = buildHTML(doc, buf) err = buildHTML(doc, buf)
if err != nil { if err != nil {
log.Err(err).Str("url", fullURL(resp.Request)).Msg("failed to build html") log.Err(err).Str("url", fullURL(resp.Request)).Msg("failed to build html")
@@ -95,8 +99,7 @@ func (m *modifyHTML) modifyResponse(resp *http.Response) error {
resp.Header.Set("Content-Length", strconv.Itoa(buf.Len())) resp.Header.Set("Content-Length", strconv.Itoa(buf.Len()))
resp.Header.Set("Content-Type", "text/html; charset=utf-8") resp.Header.Set("Content-Type", "text/html; charset=utf-8")
resp.Body = readerWithRelease(buf.Bytes(), func(_ []byte) { resp.Body = readerWithRelease(buf.Bytes(), func(_ []byte) {
// release content, not buf.Bytes() m.bytesPool.PutBuffer(buf)
release(content)
}) })
return nil return nil
} }