diff options
| author | zelig <viktor.tron@gmail.com> | 2015-01-09 14:21:47 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-01-09 14:21:47 +0800 |
| commit | b3161f5803fdab9531c611659b7827ff1a2699dd (patch) | |
| tree | 8e990b73858c4222d16a33c55119bf3ee56e2068 /ethutil | |
| parent | 5a9952c7b47f20451feea1158286450e08b85551 (diff) | |
| parent | 26f066f0c7570bcca43299721c2b7a1a70186ee3 (diff) | |
| download | dexon-b3161f5803fdab9531c611659b7827ff1a2699dd.tar dexon-b3161f5803fdab9531c611659b7827ff1a2699dd.tar.gz dexon-b3161f5803fdab9531c611659b7827ff1a2699dd.tar.bz2 dexon-b3161f5803fdab9531c611659b7827ff1a2699dd.tar.lz dexon-b3161f5803fdab9531c611659b7827ff1a2699dd.tar.xz dexon-b3161f5803fdab9531c611659b7827ff1a2699dd.tar.zst dexon-b3161f5803fdab9531c611659b7827ff1a2699dd.zip | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'ethutil')
| -rw-r--r-- | ethutil/path.go | 2 | ||||
| -rw-r--r-- | ethutil/rlp.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ethutil/path.go b/ethutil/path.go index f64e3849e..e545c8731 100644 --- a/ethutil/path.go +++ b/ethutil/path.go @@ -12,7 +12,7 @@ func ExpandHomePath(p string) (path string) { path = p // Check in case of paths like "/something/~/something/" - if path[:2] == "~/" { + if len(path) > 1 && path[:2] == "~/" { usr, _ := user.Current() dir := usr.HomeDir diff --git a/ethutil/rlp.go b/ethutil/rlp.go index 1bc1a58a7..0cb0d611c 100644 --- a/ethutil/rlp.go +++ b/ethutil/rlp.go @@ -137,7 +137,7 @@ func Encode(object interface{}) []byte { case byte: buff.Write(Encode(big.NewInt(int64(t)))) case *big.Int: - // Not sure how this is possible while we check for + // Not sure how this is possible while we check for nil if t == nil { buff.WriteByte(0xc0) } else { |