feat: add Memory.loadAlloc (#29)

extism · Feb 22, 2024 · 336af87 · 336af87
1 parent 6839dd7
commit 336af87
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/Memory.zig b/src/Memory.zig
@@ -30,6 +30,12 @@ pub fn load(self: Self, buf: []u8) void {
     }
 }
 
+pub fn loadAlloc(self: Self, allocator: std.mem.Allocator) ![]u8 {
+    const out = try allocator.alloc(u8, @intCast(self.length));
+    self.load(out);
+    return out;
+}
+
 pub fn store(self: Self, buf: []const u8) void {
     const len = buf.len;
     var i: usize = 0;

diff --git a/src/main.zig b/src/main.zig
@@ -133,9 +133,7 @@ pub const Plugin = struct {
         }
         const memory = Memory.init(offset, c_len);
         defer memory.free();
-        const value = try self.allocator.alloc(u8, @intCast(c_len));
-        errdefer self.allocator.free(value);
-        memory.load(value);
+        const value = try memory.loadAlloc(self.allocator);
         return value;
     }
 
@@ -166,9 +164,8 @@ pub const Plugin = struct {
         }
         const memory = Memory.init(offset, c_len);
         defer memory.free();
-        const value = try self.allocator.alloc(u8, @intCast(c_len));
-        errdefer self.allocator.free(value);
-        memory.load(value);
+        defer memory.free();
+        const value = try memory.loadAlloc(self.allocator);
         return value;
     }