diff --git a/pkg/core/blockchain.go b/pkg/core/blockchain.go index 46d448668..07af0b03f 100644 --- a/pkg/core/blockchain.go +++ b/pkg/core/blockchain.go @@ -945,15 +945,14 @@ func (bc *Blockchain) processNEP5Transfer(cache *dao.Cached, transfer *state.NEP return } bs := balances.Trackers[transfer.Asset] - if bs.Balance == nil { - return - } - bs.Balance.Sub(bs.Balance, transfer.Amount) - if bs.Balance.Sign() > 0 { - bs.LastUpdatedBlock = transfer.Block - balances.Trackers[transfer.Asset] = bs - } else { - delete(balances.Trackers, transfer.Asset) + if bs.Balance != nil { + bs.Balance.Sub(bs.Balance, transfer.Amount) + if bs.Balance.Sign() > 0 { + bs.LastUpdatedBlock = transfer.Block + balances.Trackers[transfer.Asset] = bs + } else { + delete(balances.Trackers, transfer.Asset) + } } transfer.Amount.Neg(transfer.Amount) diff --git a/pkg/core/state/nep5.go b/pkg/core/state/nep5.go index a87685293..606052c12 100644 --- a/pkg/core/state/nep5.go +++ b/pkg/core/state/nep5.go @@ -188,6 +188,9 @@ func NEP5TransferFromNotification(ne NotificationEvent, txHash util.Uint256, hei if !ok { return nil, errors.New("wrong amount type") } + if len(bs) > amountSize { + return nil, errors.New("integer overflow") + } amount = emit.BytesToInt(bs) } toAddr := parseUint160(to)