From 420f473f90d3908d7a3f3cd0c245b797ae64c9f1 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Sun, 13 Mar 2016 21:28:57 +0100
Subject: [PATCH] Check for NULL_RLP in AccountDB

---
 ethcore/src/account_db.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ethcore/src/account_db.rs b/ethcore/src/account_db.rs
index 026e813f5..f95ec53a1 100644
--- a/ethcore/src/account_db.rs
+++ b/ethcore/src/account_db.rs
@@ -97,6 +97,9 @@ impl<'db> HashDB for AccountDBMut<'db>{
 	}
 
 	fn insert(&mut self, value: &[u8]) -> H256 {
+		if value == &NULL_RLP {
+			return SHA3_NULL_RLP.clone();
+		}
 		let k = value.sha3();
 		let ak = combine_key(&self.address, &k);
 		self.db.emplace(ak, value.to_vec());
@@ -104,11 +107,17 @@ impl<'db> HashDB for AccountDBMut<'db>{
 	}
 
 	fn emplace(&mut self, key: H256, value: Bytes) {
+		if key == SHA3_NULL_RLP {
+			return;
+		}
 		let key = combine_key(&self.address, &key);
 		self.db.emplace(key, value.to_vec())
 	}
 
 	fn kill(&mut self, key: &H256) {
+		if key == &SHA3_NULL_RLP {
+			return;
+		}
 		let key = combine_key(&self.address, key);
 		self.db.kill(&key)
 	}