Merge pull request #14 from svandisproject/transfer-critical-bug

transfer bugs fixed
svandisproject · May 28, 2018 · e64bef3 · e64bef3
2 parents bcc1ab1 + 0d59370
commit e64bef3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Sale.sol b/Sale.sol
@@ -124,12 +124,19 @@ contract Sale is Svandis {
         uint256 quantity = (msg.value * tierToRates[currentTier])/10^18;
 
         require(quantity <= allowed[this][msg.sender]);
-        transfer(msg.sender, quantity);
-
+
+        balances[msg.sender] += quantity;
+        balances[address(this)] -= quantity;
+
+        emit Transfer(this, msg.sender, quantity);
+
 	withdrawWallet.transfer(msg.value);
     }
 
     function takeCompanyTokensOwnership() public {
-        transfer(msg.sender, companyAllowed[msg.sender]);
+        balances[msg.sender] += companyAllowed[msg.sender];
+        balances[address(this)] -= companyAllowed[msg.sender];
+
+        emit Transfer(this, msg.sender, companyAllowed[msg.sender]);
     }
 }
diff --git a/Svandis.sol b/Svandis.sol
@@ -27,6 +27,7 @@ contract Svandis is EIP20Interface {
     function transferFrom(address _from, address _to, uint256 _value) public returns (bool success) {
         uint256 allowance = allowed[_from][msg.sender];
         require(balances[_from] >= _value && allowance >= _value);
+        require(_from != address(this));
         balances[_to] += _value;
         balances[_from] -= _value;
         if (allowance < MAX_UINT256) {