Skip to content

Commit 92ed3d5

Browse files
committed
address review feedback
1 parent 44228c7 commit 92ed3d5

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

‎aescbc/aescbc.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,11 @@ func Encrypt(random io.Reader, key []byte, plaintext []byte) ([]byte, error) {
6666

6767
// PKCS7 unpadding
6868
func pkcs7Unpad(data []byte) ([]byte, error) {
69+
if len(data) == 0 {
70+
return nil, fmt.Errorf("invalid padding")
71+
}
6972
padding := int(data[len(data)-1])
70-
if padding < 1 || padding > aes.BlockSize {
73+
if padding < 1 || padding > aes.BlockSize || padding > len(data) {
7174
return nil, fmt.Errorf("invalid padding")
7275
}
7376
for _, b := range data[len(data)-padding:] {

‎tracing/middleware.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ type MiddlewareOption func(*middlewareConfig)
2323
// Default: "X-Sequence-Span".
2424
func WithHeaderName(name string) MiddlewareOption {
2525
return func(c *middlewareConfig) {
26-
c.headerName = name
26+
if name != "" {
27+
c.headerName = name
28+
}
2729
}
2830
}
2931

0 commit comments

Comments
 (0)