Fixed "memory access out of bounds"

lupyuen · May 28, 2023 · 43fa982 · 43fa982
1 parent 949a730
commit 43fa982
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lvglwasm.wasm b/lvglwasm.wasm
diff --git a/lvglwasm.zig b/lvglwasm.zig
@@ -206,17 +206,18 @@ export fn malloc(size: usize) ?*anyopaque {
 
 /// Zig replacement for realloc
 export fn realloc(old_mem: [*c]u8, size: usize) ?*anyopaque {
- if (old_mem != null) {
- // TODO: How to free without the slice length?
- // memory_allocator.allocator().free(old_mem[0..???]);
- }
  // TODO: Call realloc instead
  // const mem = memory_allocator.allocator().realloc(old_mem[0..???], size) catch {
  // @panic("*** realloc error: out of memory");
  // };
  const mem = memory_allocator.allocator().alloc(u8, size) catch {
  @panic("*** realloc error: out of memory");
  };
+ _ = memcpy(mem.ptr, old_mem, size);
+ if (old_mem != null) {
+ // TODO: How to free without the slice length?
+ // memory_allocator.allocator().free(old_mem[0..???]);
+ }
  return mem.ptr;
 }