Skip to content

Commit 7befa1f

Browse files
authored
Merge pull request #67 from p53/fix-get-string-array
Fix getStringArray, in that method, when length was -1 it was returni…
2 parents a4c2911 + 3beb68d commit 7befa1f

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

proxy/protocol/real_decoder.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,19 +250,14 @@ func (rd *realDecoder) getInt64Array() ([]int64, error) {
250250
}
251251

252252
func (rd *realDecoder) getStringArray() ([]string, error) {
253-
if rd.remaining() < 4 {
254-
rd.off = len(rd.raw)
255-
return nil, ErrInsufficientData
256-
}
257-
n := int(binary.BigEndian.Uint32(rd.raw[rd.off:]))
258-
rd.off += 4
253+
n, err := rd.getArrayLength()
259254

260-
if n == 0 {
261-
return nil, nil
255+
if err != nil {
256+
return nil, err
262257
}
263258

264-
if n < 0 {
265-
return nil, errInvalidArrayLength
259+
if n == -1 {
260+
return nil, nil
266261
}
267262

268263
ret := make([]string, n)

0 commit comments

Comments
 (0)