diff options
| -rw-r--r-- | src/binary-reader.cc | 10 | ||||
| -rw-r--r-- | test/binary/bad-start-func.txt | 2 | ||||
| -rw-r--r-- | test/spec/exports.txt | 6 | ||||
| -rw-r--r-- | test/spec/start.txt | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/binary-reader.cc b/src/binary-reader.cc index 435d4d5d..67567173 100644 --- a/src/binary-reader.cc +++ b/src/binary-reader.cc @@ -1213,7 +1213,7 @@ static void read_export_section(Context* ctx, uint32_t section_size) { uint8_t external_kind; in_u8(ctx, &external_kind, "export external kind"); RAISE_ERROR_UNLESS(is_valid_external_kind(external_kind), - "invalid export external kind"); + "invalid export external kind: %d", external_kind); uint32_t item_index; in_u32_leb128(ctx, &item_index, "export item index"); @@ -1224,15 +1224,15 @@ static void read_export_section(Context* ctx, uint32_t section_size) { break; case ExternalKind::Table: RAISE_ERROR_UNLESS(item_index < num_total_tables(ctx), - "invalid export table index"); + "invalid export table index: %d", item_index); break; case ExternalKind::Memory: RAISE_ERROR_UNLESS(item_index < num_total_memories(ctx), - "invalid export memory index"); + "invalid export memory index: %d", item_index); break; case ExternalKind::Global: RAISE_ERROR_UNLESS(item_index < num_total_globals(ctx), - "invalid export global index"); + "invalid export global index: %d", item_index); break; } @@ -1247,7 +1247,7 @@ static void read_start_section(Context* ctx, uint32_t section_size) { uint32_t func_index; in_u32_leb128(ctx, &func_index, "start function index"); RAISE_ERROR_UNLESS(func_index < num_total_funcs(ctx), - "invalid start function index"); + "invalid start function index: %d", func_index); CALLBACK(OnStartFunction, func_index); CALLBACK0(EndStartSection); } diff --git a/test/binary/bad-start-func.txt b/test/binary/bad-start-func.txt index 6bbb633f..74e73e89 100644 --- a/test/binary/bad-start-func.txt +++ b/test/binary/bad-start-func.txt @@ -7,6 +7,6 @@ section(FUNCTION) { count[1] sig[0] } section(START) { func[1] } (;; STDERR ;;; Error running "wasm2wast": -error: @0x00000015: invalid start function index +error: @0x00000015: invalid start function index: 1 ;;; STDERR ;;) diff --git a/test/spec/exports.txt b/test/spec/exports.txt index e8a25ca9..2014b31f 100644 --- a/test/spec/exports.txt +++ b/test/spec/exports.txt @@ -19,7 +19,7 @@ out/third_party/testsuite/exports.wast:47: assert_invalid passed: error: duplicate export "a" error: @0x00000022: OnExport callback failed out/third_party/testsuite/exports.wast:76: assert_invalid passed: - error: @0x00000017: invalid export global index + error: @0x00000017: invalid export global index: 1 out/third_party/testsuite/exports.wast:80: assert_invalid passed: error: duplicate export "a" error: @0x0000001b: OnExport callback failed @@ -36,7 +36,7 @@ out/third_party/testsuite/exports.wast:96: assert_invalid passed: error: duplicate export "a" error: @0x00000020: OnExport callback failed out/third_party/testsuite/exports.wast:124: assert_invalid passed: - error: @0x00000015: invalid export table index + error: @0x00000015: invalid export table index: 1 out/third_party/testsuite/exports.wast:128: assert_invalid passed: error: duplicate export "a" error: @0x00000019: OnExport callback failed @@ -50,7 +50,7 @@ out/third_party/testsuite/exports.wast:145: assert_invalid passed: error: duplicate export "a" error: @0x0000001e: OnExport callback failed out/third_party/testsuite/exports.wast:173: assert_invalid passed: - error: @0x00000014: invalid export memory index + error: @0x00000014: invalid export memory index: 1 out/third_party/testsuite/exports.wast:177: assert_invalid passed: error: duplicate export "a" error: @0x00000018: OnExport callback failed diff --git a/test/spec/start.txt b/test/spec/start.txt index e7270d14..01886f3c 100644 --- a/test/spec/start.txt +++ b/test/spec/start.txt @@ -2,7 +2,7 @@ ;;; STDIN_FILE: third_party/testsuite/start.wast (;; STDOUT ;;; out/third_party/testsuite/start.wast:2: assert_invalid passed: - error: @0x00000015: invalid start function index + error: @0x00000015: invalid start function index: 1 out/third_party/testsuite/start.wast:7: assert_invalid passed: error: start function must not return anything error: @0x00000016: OnStartFunction callback failed |