root/ncdu-zig
1
0
Fork 0
mirror of https://code.blicky.net/yorhel/ncdu.git synced 2026-01-13 01:08:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix integer overflow in binary export

Browse source 
And allocate an appropriately-sized initial block when
--export-block-size is set.

Fixes #257.
This commit is contained in:
Yorhel 2025-04-28 12:38:14 +02:00
parent 35a9faadb2
commit d97a7f73dd
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/bin_export.zig
View file

@ -17,8 +17,6 @@ pub const global = struct {
var root_itemref: u64 = 0; var root_itemref: u64 = 0;
}; };
const BLOCK_SIZE: usize = 64*1024;
pub const SIGNATURE = "\xbfncduEX1"; pub const SIGNATURE = "\xbfncduEX1";
pub const ItemKey = enum(u5) { pub const ItemKey = enum(u5) {
@ -81,10 +79,15 @@ fn blockSize(num: u32) usize {
else 2048<<10; // 32768 else 2048<<10; // 32768
} }
// Upper bound on the return value of blockSize()
// (config.export_block_size may be larger than the sizes listed above, let's
// stick with the maximum block size supported by the file format to be safe)
const MAX_BLOCK_SIZE: usize = 1<<28;
pub const Thread = struct { pub const Thread = struct {
buf: []u8 = undefined, buf: []u8 = undefined,
off: usize = std.math.maxInt(usize) - (1<<10), // large number to trigger a flush() for the first write off: usize = MAX_BLOCK_SIZE, // pretend we have a full block to trigger a flush() for the first write
block_num: u32 = std.math.maxInt(u32), block_num: u32 = std.math.maxInt(u32),
itemref: u64 = 0, // ref of item currently being written itemref: u64 = 0, // ref of item currently being written
@ -124,7 +127,7 @@ pub const Thread = struct {
global.lock.lock(); global.lock.lock();
defer global.lock.unlock(); defer global.lock.unlock();
// This can only really happen when the root path exceeds BLOCK_SIZE, // This can only really happen when the root path exceeds our block size,
// in which case we would probably have error'ed out earlier anyway. // in which case we would probably have error'ed out earlier anyway.
if (expected_len > t.buf.len) ui.die("Error writing data: path too long.\n", .{}); if (expected_len > t.buf.len) ui.die("Error writing data: path too long.\n", .{});
@ -430,7 +433,7 @@ pub const Dir = struct {
pub fn createRoot(stat: *const sink.Stat, threads: []sink.Thread) Dir { pub fn createRoot(stat: *const sink.Stat, threads: []sink.Thread) Dir {
for (threads) |*t| { for (threads) |*t| {
t.sink.bin.buf = main.allocator.alloc(u8, BLOCK_SIZE) catch unreachable; t.sink.bin.buf = main.allocator.alloc(u8, blockSize(0)) catch unreachable;
} }
return .{ .stat = stat.* }; return .{ .stat = stat.* };