From 1947c6253901645f1566e01d79979d171eee418c Mon Sep 17 00:00:00 2001
From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Date: Mon, 20 Jun 2022 21:37:46 -0700
Subject: Fix assertion that checks globally allocated memory pointers

---
 src/javascript/jsc/bindings/exports.zig | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/javascript/jsc')

diff --git a/src/javascript/jsc/bindings/exports.zig b/src/javascript/jsc/bindings/exports.zig
index c70388186..fa7884a50 100644
--- a/src/javascript/jsc/bindings/exports.zig
+++ b/src/javascript/jsc/bindings/exports.zig
@@ -248,8 +248,9 @@ pub const ResolvedSource = extern struct {
 
 const Mimalloc = @import("../../../allocators/mimalloc.zig");
 
-export fn ZigString__free(ptr: [*]const u8, len: usize, allocator_: ?*anyopaque) void {
+export fn ZigString__free(raw: [*]const u8, len: usize, allocator_: ?*anyopaque) void {
     var allocator: std.mem.Allocator = @ptrCast(*std.mem.Allocator, @alignCast(@alignOf(*std.mem.Allocator), allocator_ orelse return)).*;
+    var ptr = ZigString.init(raw[0..len]).slice().ptr;
     if (comptime Environment.allow_assert) {
         std.debug.assert(Mimalloc.mi_check_owned(ptr));
     }
@@ -258,11 +259,12 @@ export fn ZigString__free(ptr: [*]const u8, len: usize, allocator_: ?*anyopaque)
     allocator.free(str);
 }
 
-export fn ZigString__free_global(ptr: [*]const u8, _: usize) void {
+export fn ZigString__free_global(ptr: [*]const u8, len: usize) void {
     if (comptime Environment.allow_assert) {
-        std.debug.assert(Mimalloc.mi_check_owned(ptr));
+        std.debug.assert(Mimalloc.mi_check_owned(ZigString.init(ptr[0..len]).slice().ptr));
     }
-    Mimalloc.mi_free(@intToPtr(*anyopaque, @ptrToInt(ptr)));
+    // we must untag the string pointer
+    Mimalloc.mi_free(@intToPtr(*anyopaque, @ptrToInt(ZigString.init(ptr[0..len]).slice().ptr)));
 }
 
 export fn Zig__getAPIGlobals(count: *usize) [*]JSC.C.JSClassRef {
-- 
cgit v1.2.3