Browse Source

Fix panic in EscapeReader (#18820)

There is a potential panic due to a mistaken resetting of the length parameter when
multibyte characters go over a read boundary.

Signed-off-by: Andrew Thornton <art27@cantab.net>
tags/v1.18.0-dev
zeripath 2 years ago
parent
commit
4b3ebda0e7
No account linked to committer's email address
2 changed files with 10 additions and 0 deletions
  1. 1
    0
      modules/charset/escape.go
  2. 9
    0
      modules/charset/escape_test.go

+ 1
- 0
modules/charset/escape.go View File

@@ -74,6 +74,7 @@ readingloop:
for err == nil {
n, err = text.Read(buf[readStart:])
bs := buf[:n+readStart]
n = len(bs)
i := 0

for i < len(bs) {

+ 9
- 0
modules/charset/escape_test.go View File

@@ -200,3 +200,12 @@ func TestEscapeControlReader(t *testing.T) {
})
}
}

func TestEscapeControlReader_panic(t *testing.T) {
bs := make([]byte, 0, 20479)
bs = append(bs, 'A')
for i := 0; i < 6826; i++ {
bs = append(bs, []byte("—")...)
}
_, _ = EscapeControlBytes(bs)
}

Loading…
Cancel
Save