Skip to content

Commit 270d6e2

Browse files
committed
switch to MaxResponseSize
Signed-off-by: Ryan Belgrave <[email protected]>
1 parent cc2a707 commit 270d6e2

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

packet_decoder.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ type packetDecoder interface {
1515
getUVarint() (uint64, error)
1616
getFloat64() (float64, error)
1717
getArrayLength() (int, error)
18-
getArrayLengthNoLimit() (int, error)
1918
getCompactArrayLength() (int, error)
2019
getBool() (bool, error)
2120
getEmptyTaggedFieldArray() (int, error)

real_decoder.go

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -115,26 +115,12 @@ func (rd *realDecoder) getArrayLength() (int, error) {
115115
if tmp > rd.remaining() {
116116
rd.off = len(rd.raw)
117117
return -1, ErrInsufficientData
118-
} else if tmp > 2*math.MaxUint16 {
118+
} else if tmp > int(MaxResponseSize) {
119119
return -1, errInvalidArrayLength
120120
}
121121
return tmp, nil
122122
}
123123

124-
func (rd *realDecoder) getArrayLengthNoLimit() (int, error) {
125-
if rd.remaining() < 4 {
126-
rd.off = len(rd.raw)
127-
return -1, ErrInsufficientData
128-
}
129-
tmp := int(int32(binary.BigEndian.Uint32(rd.raw[rd.off:])))
130-
rd.off += 4
131-
if tmp > rd.remaining() {
132-
rd.off = len(rd.raw)
133-
return -1, ErrInsufficientData
134-
}
135-
return tmp, nil
136-
}
137-
138124
func (rd *realDecoder) getCompactArrayLength() (int, error) {
139125
n, err := rd.getUVarint()
140126
if err != nil {

record_batch.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,7 @@ func (b *RecordBatch) decode(pd packetDecoder) (err error) {
157157
return err
158158
}
159159

160-
// Using NoLimit because a single record batch could contain
161-
// more then 2*math.MaxUint16 records. The packet decoder will
162-
// check to make sure the array is not greater than the
163-
// remaining bytes.
164-
numRecs, err := pd.getArrayLengthNoLimit()
160+
numRecs, err := pd.getArrayLength()
165161
if err != nil {
166162
return err
167163
}

0 commit comments

Comments
 (0)