Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[release-branch.go1.24] encoding/pem: properly calculate end indexes

Browse source 
When a block is missing the END line trailer, calculate the indexes of
the end and end trailer _before_ continuing the loop, making the
reslicing at the start of the loop work as expected.

Fixes #76028

Change-Id: If45c8cb473315623618f02cc7609f517a72d232d
Reviewed-on: https://go-review.googlesource.com/c/go/+/714200
Auto-Submit: Roland Shoemaker <roland@golang.org>
Reviewed-by: Damien Neil <dneil@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
(cherry picked from commit 839da71f89)
Reviewed-on: https://go-review.googlesource.com/c/go/+/714680
Reviewed-by: David Chase <drchase@google.com>
This commit is contained in:
Roland Shoemaker 2025-10-23 08:16:39 -07:00 • committed by Michael Knyszek
parent bbf8f423ab
commit 562709bcf5
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/encoding/pem/pem.go
View file

@ -95,6 +95,9 @@ func Decode(data []byte) (p *Block, rest []byte) {
for { for {
// If we've already tried parsing a block, skip past the END we already // If we've already tried parsing a block, skip past the END we already
// saw. // saw.
if endTrailerIndex < 0 || endTrailerIndex > len(rest) {
return nil, data
}
rest = rest[endTrailerIndex:] rest = rest[endTrailerIndex:]
// Find the first END line, and then find the last BEGIN line before // Find the first END line, and then find the last BEGIN line before
@ -116,11 +119,11 @@ func Decode(data []byte) (p *Block, rest []byte) {
var typeLine []byte var typeLine []byte
var consumed int var consumed int
typeLine, rest, consumed = getLine(rest) typeLine, rest, consumed = getLine(rest)
endIndex -= consumed
endTrailerIndex -= consumed
if !bytes.HasSuffix(typeLine, pemEndOfLine) { if !bytes.HasSuffix(typeLine, pemEndOfLine) {
continue continue
} }
endIndex -= consumed
endTrailerIndex -= consumed
typeLine = typeLine[0 : len(typeLine)-len(pemEndOfLine)] typeLine = typeLine[0 : len(typeLine)-len(pemEndOfLine)]
p = &Block{ p = &Block{

4
src/encoding/pem/pem_test.go
View file

@ -736,3 +736,7 @@ func FuzzDecode(f *testing.F) {
Decode(data) Decode(data)
}) })
} }
func TestMissingEndTrailer(t *testing.T) {
Decode([]byte{0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0xa, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20})
}