Merge pull request OpenZeppelin#377 from yaronvel/master

fix for issue 375: transferFrom allows sending to self more than self balance
classicdelta · Aug 19, 2017 · dd9fdaf · dd9fdaf
2 parents 98ad712 + cea752d
commit dd9fdaf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/contracts/token/StandardToken.sol b/contracts/token/StandardToken.sol
@@ -29,8 +29,8 @@ contract StandardToken is ERC20, BasicToken {
     // Check is not needed because sub(_allowance, _value) will already throw if this condition is not met
     // require (_value <= _allowance);
 
-    balances[_to] = balances[_to].add(_value);
     balances[_from] = balances[_from].sub(_value);
+    balances[_to] = balances[_to].add(_value);
     allowed[_from][msg.sender] = _allowance.sub(_value);
     Transfer(_from, _to, _value);
     return true;