From 2ffb060cfc4052fd3345536913d6fe15b4826b54 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Thu, 28 Oct 2021 03:55:43 -0700 Subject: [PATCH] remove global allocator from u.validate_hash --- src/common.zig | 2 +- src/util/funcs.zig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common.zig b/src/common.zig index 30a9169dee602ea04eed26188493bc36f99ac095..d927d473660dd846df5ef274752f08f49aa48acb 100644 --- a/src/common.zig +++ b/src/common.zig @@ -181,7 +181,7 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) ! } const file_path = try std.fs.path.join(gpa, &.{ pv, file_name }); try d.type.pull(gpa, d.path, pv); - if (try u.validate_hash(d.version, file_path)) { + if (try u.validate_hash(gpa, d.version, file_path)) { try std.fs.cwd().deleteFile(file_path); return pv; } diff --git a/src/util/funcs.zig b/src/util/funcs.zig index b93ee893af5fcbfb59609618a5f97ae1d0ac5f1b..34723ab6ec1957643959eff22692a0290badf65b 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -207,11 +207,11 @@ pub const HashFn = enum { sha512, }; -pub fn validate_hash(input: string, file_path: string) !bool { +pub fn validate_hash(alloc: *std.mem.Allocator, input: string, file_path: string) !bool { const hash = parse_split(HashFn, "-").do(input) catch return false; const file = try std.fs.cwd().openFile(file_path, .{}); defer file.close(); - const data = try file.reader().readAllAlloc(gpa, gb); + const data = try file.reader().readAllAlloc(alloc, gb); const expected = hash.string; const actual = switch (hash.id) { .blake3 => try do_hash(std.crypto.hash.Blake3, data), -- 2.54.0