From bdaa43510b294bf49bbac1392d5518611c06eedc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20W=C3=BCstholz?=
 <wuestholz@users.noreply.github.com>
Date: Thu, 22 Dec 2016 00:37:27 +0100
Subject: [PATCH] cmd/disasm: fix off-by-one error and improve error handling
 (#3482)

---
 cmd/disasm/main.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cmd/disasm/main.go b/cmd/disasm/main.go
index ba1295ba1..d792e8ee5 100644
--- a/cmd/disasm/main.go
+++ b/cmd/disasm/main.go
@@ -21,8 +21,9 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"encoding/hex"
+	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/vm"
 )
 
@@ -32,7 +33,11 @@ func main() {
 		fmt.Println(err)
 		os.Exit(1)
 	}
-	code = common.Hex2Bytes(string(code[:len(code)-1]))
+	code, err = hex.DecodeString(strings.TrimSpace(string(code[:])))
+	if err != nil {
+		fmt.Printf("Error: %v\n", err)
+		return
+	}
 	fmt.Printf("%x\n", code)
 
 	for pc := uint64(0); pc < uint64(len(code)); pc++ {