Merge pull request #1220 from BeChris/accept_uppercase_hexa_in_pktline_length

pjbgf · web-flow · commit 7d6fbc2c2a05 · 2024-12-22T10:17:04.000Z
pktline : accept upercase hexadecimal value as pktline length information
diff --git a/plumbing/format/pktline/scanner.go b/plumbing/format/pktline/scanner.go
@@ -140,6 +140,8 @@ func asciiHexToByte(b byte) (byte, error) {
 		return b - '0', nil
 	case b >= 'a' && b <= 'f':
 		return b - 'a' + 10, nil
+	case b >= 'A' && b <= 'F':
+		return b - 'A' + 10, nil
 	default:
 		return 0, ErrInvalidPktLen
 	}
diff --git a/plumbing/format/pktline/scanner_test.go b/plumbing/format/pktline/scanner_test.go
@@ -6,8 +6,10 @@ import (
 	"fmt"
 	"io"
 	"strings"
+	"testing"
 
 	"github.com/go-git/go-git/v5/plumbing/format/pktline"
+	"github.com/stretchr/testify/assert"
 
 	. "gopkg.in/check.v1"
 )
@@ -21,6 +23,7 @@ func (s *SuiteScanner) TestInvalid(c *C) {
 		"0001", "0002", "0003", "0004",
 		"0001asdfsadf", "0004foo",
 		"fff5", "ffff",
+		"FFF5", "FFFF",
 		"gorka",
 		"0", "003",
 		"   5a", "5   a", "5   \n",
@@ -48,6 +51,24 @@ func (s *SuiteScanner) TestDecodeOversizePktLines(c *C) {
 	}
 }
 
+func TestValidPktSizes(t *testing.T) {
+	for _, test := range [...]string{
+		"01fe" + strings.Repeat("a", 0x01fe-4),
+		"01FE" + strings.Repeat("a", 0x01fe-4),
+		"00b5" + strings.Repeat("a", 0x00b5-4),
+		"00B5" + strings.Repeat("a", 0x00b5-4),
+	} {
+		r := strings.NewReader(test)
+		sc := pktline.NewScanner(r)
+		hasPayload := sc.Scan()
+		obtained := sc.Bytes()
+
+		assert.True(t, hasPayload)
+		assert.NoError(t, sc.Err())
+		assert.Equal(t, []byte(test[4:]), obtained)
+	}
+}
+
 func (s *SuiteScanner) TestEmptyReader(c *C) {
 	r := strings.NewReader("")
 	sc := pktline.NewScanner(r)

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,8 @@ func asciiHexToByte(b byte) (byte, error) {`
`140`	`140`	`return b - '0', nil`
`141`	`141`	`case b >= 'a' && b <= 'f':`
`142`	`142`	`return b - 'a' + 10, nil`
	`143`	`+ case b >= 'A' && b <= 'F':`
	`144`	`+ return b - 'A' + 10, nil`
`143`	`145`	`default:`
`144`	`146`	`return 0, ErrInvalidPktLen`
`145`	`147`	`}`