cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix transferFrom.

Browse Source
This commit is contained in:
chriseth 2017-01-23 14:58:07 +01:00 committed by GitHub
parent c6207e2761
commit 318fbb2604
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
std/StandardToken.sol
View File

@ -22,19 +22,23 @@ contract StandardToken is Token {
} }
function transfer(address _to, uint256 _value) returns (bool success) { function transfer(address _to, uint256 _value) returns (bool success) {
if (balance[msg.sender] >= _value && balance[_to] + _value >= balance[_to]) { return doTransfer(msg.sender, _to, _value);
balance[msg.sender] -= _value; }
balance[_to] += _value;
Transfer(msg.sender, _to, _value); function transferFrom(address _from, address _to, uint256 _value) returns (bool success) {
if (m_allowance[_from][msg.sender] >= _value) {
if (doTransfer(_from, _to, _value)) {
m_allowance[_from][msg.sender] -= _value;
}
return true; return true;
} else { } else {
return false; return false;
} }
} }
function transferFrom(address _from, address _to, uint256 _value) returns (bool success) { function doTransfer(address _from, address _to, uint _value) internal returns (bool success) {
if (m_allowance[_from][msg.sender] >= _value && balance[_to] + _value >= balance[_to]) { if (balance[_from] >= _value && balance[_to] + _value >= balance[_to]) {
m_allowance[_from][msg.sender] -= _value; balance[_from] -= _value;
balance[_to] += _value; balance[_to] += _value;
Transfer(_from, _to, _value); Transfer(_from, _to, _value);
return true; return true;