zig

commit b642bb92e5cf5ca8e4e3a9214ec148f438f896a3 (tree)
parent 9126852ba93c6df2f1bb2deff6e276561b58f313
Author: Techatrix <19954306+Techatrix@users.noreply.github.com>
Date:   Fri,  8 Sep 2023 00:03:23 +0200

wasm-linker: fix use of invalidated memory in populateErrorNameTable

Diffstat:
M
src/link/Wasm.zig
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig
@@ -3005,7 +3005,6 @@ pub fn getErrorTableSymbol(wasm: *Wasm) !u32 {
 fn populateErrorNameTable(wasm: *Wasm) !void {
     const symbol_index = wasm.error_table_symbol orelse return;
     const atom_index = wasm.symbol_atom.get(.{ .file = null, .index = symbol_index }).?;
-    const atom = wasm.getAtomPtr(atom_index);
 
     // Rather than creating a symbol for each individual error name,
     // we create a symbol for the entire region of error names. We then calculate
@@ -3030,6 +3029,8 @@ fn populateErrorNameTable(wasm: *Wasm) !void {
     var addend: u32 = 0;
     const mod = wasm.base.options.module.?;
     for (mod.global_error_set.keys()) |error_name_nts| {
+        const atom = wasm.getAtomPtr(atom_index);
+
         const error_name = mod.intern_pool.stringToSlice(error_name_nts);
         const len = @as(u32, @intCast(error_name.len + 1)); // names are 0-termianted