Skip to content

Commit a39045b

Browse files
committed
Fix uninitialized memory access
1 parent c222699 commit a39045b

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

src/MultiIndex.zig

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub fn acquireIndex(self: *Self, id: u8, create: bool) !*IndexRef {
8080
return err;
8181
};
8282

83-
result.value_ptr.references += 1;
83+
result.value_ptr.references = 1;
8484
result.value_ptr.last_used_at = std.time.timestamp();
8585
return result.value_ptr;
8686
}

src/filefmt.zig

+4-6
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,7 @@ test "writeBlock/readBlock/readFirstItemFromBlock" {
223223
}
224224

225225
// "SGM1"
226-
const header_magic_v1 = 0x53474d31;
227-
228-
// "1SGM"
229-
const footer_magic_v1 = 0x3153474d;
226+
const header_magic_v1 = 0x31474d53;
230227

231228
pub const Header = packed struct {
232229
magic: u32 = header_magic_v1,
@@ -428,20 +425,21 @@ test "writeFile/readFile" {
428425
}
429426
}
430427

431-
// "IDX1"
432-
const index_header_magic_v1: u32 = 0x49445831;
428+
const index_header_magic_v1: u32 = 0x31584449; // "IDX1"
433429

434430
const IndexHeader = packed struct {
435431
magic: u32,
436432
version: u32,
437433
num_segments: u32,
434+
reserved: u32,
438435
};
439436

440437
pub fn writeIndexFile(writer: anytype, segments: std.ArrayList(SegmentVersion)) !void {
441438
const header = IndexHeader{
442439
.magic = index_header_magic_v1,
443440
.version = 1,
444441
.num_segments = @intCast(segments.items.len),
442+
.reserved = 0,
445443
};
446444
try writer.writeStructEndian(header, .little);
447445
for (segments.items) |segment| {

src/main.zig

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn main() !void {
1616
defer args.deinit();
1717

1818
const dir_path = args.get("dir") orelse ".";
19-
const dir = try std.fs.cwd().openDir(dir_path, .{});
19+
const dir = try std.fs.cwd().makeOpenPath(dir_path, .{ .iterate = true });
2020

2121
const address = args.get("address") orelse "127.0.0.1";
2222

0 commit comments

Comments
 (0)