codec: readFull: increment bytes read by the actual number

ugorji · ugorji · commit e4342dc39705 · 2023-01-05T00:16:26.000-05:00
diff --git a/codec/reader.go b/codec/reader.go
@@ -244,19 +244,19 @@ func (z *ioDecReader) readx(n uint) (bs []byte) {
 	} else {
 		bs = make([]byte, n)
 	}
-	_, err := readFull(z.br, bs)
+	nn, err := readFull(z.br, bs)
+	z.n += nn
 	halt.onerror(err)
-	z.n += uint(len(bs))
 	return
 }
 
 func (z *ioDecReader) readb(bs []byte) {
 	if len(bs) == 0 {
 		return
 	}
-	_, err := readFull(z.br, bs)
+	nn, err := readFull(z.br, bs)
+	z.n += nn
 	halt.onerror(err)
-	z.n += uint(len(bs))
 }
 
 func (z *ioDecReader) readn1() (b uint8) {

Original file line number	Diff line number	Diff line change
`@@ -244,19 +244,19 @@ func (z *ioDecReader) readx(n uint) (bs []byte) {`
`244`	`244`	`} else {`
`245`	`245`	`bs = make([]byte, n)`
`246`	`246`	`}`
`247`		`- _, err := readFull(z.br, bs)`
	`247`	`+ nn, err := readFull(z.br, bs)`
	`248`	`+ z.n += nn`
`248`	`249`	`halt.onerror(err)`
`249`		`- z.n += uint(len(bs))`
`250`	`250`	`return`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`func (z *ioDecReader) readb(bs []byte) {`
`254`	`254`	`if len(bs) == 0 {`
`255`	`255`	`return`
`256`	`256`	`}`
`257`		`- _, err := readFull(z.br, bs)`
	`257`	`+ nn, err := readFull(z.br, bs)`
	`258`	`+ z.n += nn`
`258`	`259`	`halt.onerror(err)`
`259`		`- z.n += uint(len(bs))`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`func (z *ioDecReader) readn1() (b uint8) {`