Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 00:36:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

terminal: bitmap allocator had off by one on extra bitmaps

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-03-13 17:30:15 -07:00
parent 5c7460a741
commit 2fe68eb973
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/terminal-old/modes.zig
View File

@ -89,7 +89,7 @@ pub const ModePacked = packed_struct: {
} }
break :packed_struct @Type(.{ .Struct = .{ break :packed_struct @Type(.{ .Struct = .{
.layout = .Packed, .layout = .@"packed",
.fields = &fields, .fields = &fields,
.decls = &.{}, .decls = &.{},
.is_tuple = false, .is_tuple = false,

5
src/terminal/bitmap_allocator.zig
View File

@ -76,6 +76,7 @@ pub fn BitmapAllocator(comptime chunk_size: comptime_int) type {
// fixed but we haven't needed it. Contributor friendly: add tests // fixed but we haven't needed it. Contributor friendly: add tests
// and fix this. // and fix this.
assert(chunk_size % @alignOf(T) == 0); assert(chunk_size % @alignOf(T) == 0);
assert(n > 0);
const byte_count = std.math.mul(usize, @sizeOf(T), n) catch const byte_count = std.math.mul(usize, @sizeOf(T), n) catch
return error.OutOfMemory; return error.OutOfMemory;
@ -193,7 +194,7 @@ fn findFreeChunks(bitmaps: []u64, n: usize) ?usize {
bitmap.* ^= mask; bitmap.* ^= mask;
} }
return (idx * 63) + bit; return (idx * 64) + bit;
} }
return null; return null;
@ -229,7 +230,7 @@ test "findFreeChunks multiple found" {
0b10000000_00111110_00000000_00000000_00000000_00000000_00111110_00000000, 0b10000000_00111110_00000000_00000000_00000000_00000000_00111110_00000000,
}; };
const idx = findFreeChunks(&bitmaps, 4).?; const idx = findFreeChunks(&bitmaps, 4).?;
try testing.expectEqual(@as(usize, 72), idx); try testing.expectEqual(@as(usize, 73), idx);
try testing.expectEqual( try testing.expectEqual(
0b10000000_00111110_00000000_00000000_00000000_00000000_00100000_00000000, 0b10000000_00111110_00000000_00000000_00000000_00000000_00100000_00000000,
bitmaps[1], bitmaps[1],