Skip to content

Commit 426088d

Browse files
Fix race within pkcs7.asn1Structured.EncodeTo (#30162)
- The function was incrementing and decrementing a global variable but was never used so remove it completely and all the commented out code that references the encodeIndent global.
1 parent b9188ba commit 426088d

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

helper/pkcs7/ber.go

-7
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import (
55
"errors"
66
)
77

8-
var encodeIndent = 0
9-
108
type asn1Object interface {
119
EncodeTo(writer *bytes.Buffer) error
1210
}
@@ -17,16 +15,13 @@ type asn1Structured struct {
1715
}
1816

1917
func (s asn1Structured) EncodeTo(out *bytes.Buffer) error {
20-
// fmt.Printf("%s--> tag: % X\n", strings.Repeat("| ", encodeIndent), s.tagBytes)
21-
encodeIndent++
2218
inner := new(bytes.Buffer)
2319
for _, obj := range s.content {
2420
err := obj.EncodeTo(inner)
2521
if err != nil {
2622
return err
2723
}
2824
}
29-
encodeIndent--
3025
out.Write(s.tagBytes)
3126
encodeLength(out, inner.Len())
3227
out.Write(inner.Bytes())
@@ -47,8 +42,6 @@ func (p asn1Primitive) EncodeTo(out *bytes.Buffer) error {
4742
if err = encodeLength(out, p.length); err != nil {
4843
return err
4944
}
50-
// fmt.Printf("%s--> tag: % X length: %d\n", strings.Repeat("| ", encodeIndent), p.tagBytes, p.length)
51-
// fmt.Printf("%s--> content length: %d\n", strings.Repeat("| ", encodeIndent), len(p.content))
5245
out.Write(p.content)
5346

5447
return nil

0 commit comments

Comments
 (0)