X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=r.go;h=098ee49be485cb37a10e420c5fce7c03c6405a5d;hb=8fa6c4b0000e2dc27fce9220db1a5eb8bf468e81;hp=0c65fd41d01d5039c2b9a3e36bbf9cb6e6b3f892;hpb=db1063cacc062476c517de92da16720aa574ed19;p=netstring.git

diff --git a/r.go b/r.go
index 0c65fd4..098ee49 100644
--- a/r.go
+++ b/r.go
@@ -48,13 +48,23 @@ func (r *Reader) Next() (uint64, error) {
 	if err != nil {
 		return 0, fmt.Errorf("netstring header: %w", err)
 	}
-	size, err := strconv.ParseUint(string(lenRaw[:len(lenRaw)-1]), 10, 64)
+	lenRaw = lenRaw[:len(lenRaw)-1]
+	if len(lenRaw) > 1 && lenRaw[0] == '0' {
+		return 0, errors.New("netstring header: leading zero")
+	}
+	size, err := strconv.ParseUint(string(lenRaw), 10, 64)
 	if err != nil {
 		return 0, fmt.Errorf("netstring header: %w", err)
 	}
 	r.left = size
 	r.eof = false
-	return size, nil
+	if r.left == 0 {
+		err = r.checkTerminator()
+		if err == nil {
+			r.eof = true
+		}
+	}
+	return size, err
 }
 
 func (r *Reader) checkTerminator() error {