aboutsummaryrefslogtreecommitdiffstats
path: root/vm.cpp
diff options
context:
space:
mode:
authorChristoph Jentzsch <jentzsch.software@gmail.com>2014-11-04 06:49:05 +0800
committerChristoph Jentzsch <jentzsch.software@gmail.com>2014-11-04 06:49:05 +0800
commit1310011f77d157265c8137daf90c9f7bb9f6e90e (patch)
tree63ec1de03c0a9bb6562f197ed4e126014fd1b05a /vm.cpp
parentc931e3ceec902c31734fe6e7143a209d7637611f (diff)
downloaddexon-solidity-1310011f77d157265c8137daf90c9f7bb9f6e90e.tar
dexon-solidity-1310011f77d157265c8137daf90c9f7bb9f6e90e.tar.gz
dexon-solidity-1310011f77d157265c8137daf90c9f7bb9f6e90e.tar.bz2
dexon-solidity-1310011f77d157265c8137daf90c9f7bb9f6e90e.tar.lz
dexon-solidity-1310011f77d157265c8137daf90c9f7bb9f6e90e.tar.xz
dexon-solidity-1310011f77d157265c8137daf90c9f7bb9f6e90e.tar.zst
dexon-solidity-1310011f77d157265c8137daf90c9f7bb9f6e90e.zip
Fix ABAcalls OOG bug
Diffstat (limited to 'vm.cpp')
-rw-r--r--vm.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/vm.cpp b/vm.cpp
index 4061d789..87670671 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -29,7 +29,7 @@ using namespace dev::eth;
using namespace dev::test;
FakeExtVM::FakeExtVM(eth::BlockInfo const& _previousBlock, eth::BlockInfo const& _currentBlock, unsigned _depth): /// TODO: XXX: remove the default argument & fix.
- ExtVMFace(Address(), Address(), Address(), 0, 1, bytesConstRef(), bytesConstRef(), _previousBlock, _currentBlock, _depth) {}
+ ExtVMFace(Address(), Address(), Address(), 0, 1, bytesConstRef(), bytes(), _previousBlock, _currentBlock, _depth) {}
h160 FakeExtVM::create(u256 _endowment, u256* _gas, bytesConstRef _init, OnOpFunc const&)
{
@@ -206,11 +206,11 @@ void FakeExtVM::importExec(mObject& _o)
gas = toInt(_o["gas"]);
thisTxCode.clear();
- code = &thisTxCode;
+ code = thisTxCode;
thisTxCode = importCode(_o);
if (_o["code"].type() != str_type && _o["code"].type() != array_type)
- code.reset();
+ code.clear();
thisTxData.clear();
thisTxData = importData(_o);
@@ -303,10 +303,10 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
o["pre"] = mValue(fev.exportState());
fev.importExec(o["exec"].get_obj());
- if (!fev.code)
+ if (!fev.code.size())
{
fev.thisTxCode = get<3>(fev.addresses.at(fev.myAddress));
- fev.code = &fev.thisTxCode;
+ fev.code = fev.thisTxCode;
}
bytes output;