ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check wasm return type (#6240)

Browse Source 
* Check wasm return type

* Add more tests
This commit is contained in:
Olek
2026-01-23 16:12:14 -05:00
committed by GitHub
parent 673476ef1b
commit df98db1452
2 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/test/app/Wasm_test.cpp
View File

@@ -953,6 +953,65 @@ struct Wasm_test : public beast::unit_test::suite
env.close();
}
void
testReturnType()
{
using namespace test::jtx;
Env env(*this);
std::shared_ptr<HostFunctions> hfs(new TestHostFunctions(env, 0));
// return int64.
{ // (module
// (memory (export "memory") 1)
// (func (export "finish") (result i64)
// i64.const 0x100000000))
auto const wasmHex =
"0061736d010000000105016000017e030201000503010001"
"071302066d656d6f727902000666696e69736800000a0a01"
"08004280808080100b";
auto const wasmStr = boost::algorithm::unhex(std::string(wasmHex));
Bytes const wasm(wasmStr.begin(), wasmStr.end());
auto const re =
runEscrowWasm(wasm, hfs, ESCROW_FUNCTION_NAME, {}, 100'000);
BEAST_EXPECT(!re);
}
// return void. wasmi return execution error
{ //(module
// (type (;0;) (func))
// (func (;0;) (type 0)
// return)
// (memory (;0;) 1)
// (export "memory" (memory 0))
// (export "finish" (func 0)))
auto const wasmHex =
"0061736d01000000010401600000030201000503010001071302066d656d6f"
"727902000666696e69736800000a050103000f0b";
auto const wasmStr = boost::algorithm::unhex(std::string(wasmHex));
Bytes const wasm(wasmStr.begin(), wasmStr.end());
auto const re =
runEscrowWasm(wasm, hfs, ESCROW_FUNCTION_NAME, {}, 100'000);
BEAST_EXPECT(!re);
}
// return i32, i32. wasmi doesn't create module
{ //(module
// (memory (export "memory") 1)
// (func (export "finish") (result i32 i32)
// i32.const 0x10000000
// i32.const 0x100000FF))
auto const wasmHex =
"0061736d010000000106016000027f7f030201000503010001071302066d65"
"6d6f727902000666696e69736800000a10010e0041808080800141ff818080"
"010b";
auto const wasmStr = boost::algorithm::unhex(std::string(wasmHex));
Bytes const wasm(wasmStr.begin(), wasmStr.end());
auto const re =
runEscrowWasm(wasm, hfs, ESCROW_FUNCTION_NAME, {}, 100'000);
BEAST_EXPECT(!re);
}
}
void
run() override
{
@@ -984,6 +1043,7 @@ struct Wasm_test : public beast::unit_test::suite
testStartFunctionLoop();
testBadAlloc();
testBadAlign();
testReturnType();
// perfTest();
}

5
src/xrpld/app/wasm/detail/WasmiVM.cpp
View File

@@ -874,8 +874,11 @@ WasmiEngine::runHlp(
throw std::runtime_error(
"<" + std::string(funcName) +
"> return nothing"); // LCOV_EXCL_LINE
else if (res.r.vec_.data[0].kind != WASM_I32)
throw std::runtime_error(
"<" + std::string(funcName) + "> return type mismatch, ret: " +
std::to_string(static_cast<int>(res.r.vec_.data[0].kind)));
assert(res.r.vec_.data[0].kind == WASM_I32);
if (gas == -1)
gas = std::numeric_limits<decltype(gas)>::max();
WasmResult<int32_t> const ret{