From bd0555a8350d42762b1a288e4327d453d60c2bcd Mon Sep 17 00:00:00 2001
From: Jack Palevich <jack.palevich@gmail.com>
Date: Sat, 23 Jan 2010 15:48:21 +0800
Subject: [PATCH] Fix bugs in error reporting when parsing bad bencode data.

Discovered when trying to parse a truncated torrent file.
---
 parse.go | 48 +++++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/parse.go b/parse.go
index fdf7f3b..7eabbf7 100644
--- a/parse.go
+++ b/parse.go
@@ -107,18 +107,19 @@ func parse(r Reader, build Builder) (err os.Error) {
 Switch:
 	c, err := r.ReadByte()
 	if err != nil {
-		return
+		goto exit
 	}
 	switch {
 	case c >= '1' && c <= '9':
 		// String
 		err = r.UnreadByte()
 		if err != nil {
-			return
+			goto exit
 		}
-		str, err := decodeString(r)
+		var str string
+		str, err = decodeString(r)
 		if err != nil {
-			return
+			goto exit
 		}
 		build.String(str)
 
@@ -127,39 +128,44 @@ Switch:
 
 		build.Map()
 		for {
-			c, err := r.ReadByte()
+			c, err = r.ReadByte()
 			if err != nil {
-				return
+				goto exit
 			}
 			if c == 'e' {
 				break
 			}
 			err = r.UnreadByte()
 			if err != nil {
-				return
+				goto exit
 			}
-			key, err := decodeString(r)
+			var key string
+			key, err = decodeString(r)
 			if err != nil {
-				return
+				goto exit
 			}
 			// TODO: in pendantic mode, check for keys in ascending order.
 			err = parse(r, build.Key(key))
 			if err != nil {
-				return
+				goto exit
 			}
 		}
 
 	case c == 'i':
-		buf, err := collectInt(r, 'e')
+		var buf []byte
+		buf, err = collectInt(r, 'e')
 		if err != nil {
-			return
+			goto exit
 		}
-		str := string(buf)
+		var str string
+		var i int64
+		var i2 uint64
+		str = string(buf)
 		// If the number is exactly an integer, use that.
-		if i, err := strconv.Atoi64(str); err == nil {
+		if i, err = strconv.Atoi64(str); err == nil {
 			build.Int64(i)
-		} else if i, err := strconv.Atoui64(str); err == nil {
-			build.Uint64(i)
+		} else if i2, err = strconv.Atoui64(str); err == nil {
+			build.Uint64(i2)
 		} else {
 			err = os.NewError("Bad integer")
 		}
@@ -169,27 +175,27 @@ Switch:
 		build.Array()
 		n := 0
 		for {
-			c, err := r.ReadByte()
+			c, err = r.ReadByte()
 			if err != nil {
-				return
+				goto exit
 			}
 			if c == 'e' {
 				break
 			}
 			err = r.UnreadByte()
 			if err != nil {
-				return
+				goto exit
 			}
 			err = parse(r, build.Elem(n))
 			if err != nil {
-				return
+				goto exit
 			}
 			n++
 		}
 	default:
 		err = os.NewError("Unexpected character")
 	}
-
+exit:
 	build.Flush()
 	return
 }