Merge pull request #3036 from karalabe/release/1.4

Geth 1.4.13

3 files changed, 8 insertions, 2 deletions

diff --git a/VERSION b/VERSION
index f86e02988..acd81d7f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.12
+1.4.13
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index e0e440e5b..8bcf5c14c 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -50,7 +50,7 @@ const (
 	clientIdentifier = "Geth"   // Client identifier to advertise over the network
 	versionMajor     = 1        // Major version component of the current release
 	versionMinor     = 4        // Minor version component of the current release
-	versionPatch     = 12       // Patch version component of the current release
+	versionPatch     = 13       // Patch version component of the current release
 	versionMeta      = "stable" // Version metadata to append to the version string
 
 	versionOracle = "0xfa7b9770ca4cb04296cac84f37736d4041251cdf" // Ethereum address of the Geth release oracle
diff --git a/core/state/state_object.go b/core/state/state_object.go
index 20da1006f..7a7f6c04b 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -154,6 +154,9 @@ func (self *StateObject) Update() {
 }
 
 func (c *StateObject) AddBalance(amount *big.Int) {
+	if amount.Cmp(common.Big0) == 0 {
+		return
+	}
 	c.SetBalance(new(big.Int).Add(c.balance, amount))
 
 	if glog.V(logger.Core) {
@@ -162,6 +165,9 @@ func (c *StateObject) AddBalance(amount *big.Int) {
 }
 
 func (c *StateObject) SubBalance(amount *big.Int) {
+	if amount.Cmp(common.Big0) == 0 {
+		return
+	}
 	c.SetBalance(new(big.Int).Sub(c.balance, amount))
 
 	if glog.V(logger.Core) {