jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-30 17:12:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix memory corruption in Dir.Iterator test

Browse Source
This commit is contained in:
Jakub Konka 2020-07-01 14:15:58 +02:00
parent 64bd134818
commit b5badd1122
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/std/fs/test.zig
View File

@ -5,6 +5,7 @@ const fs = std.fs;
const mem = std.mem; const mem = std.mem;
const wasi = std.os.wasi; const wasi = std.os.wasi;
const ArenaAllocator = std.heap.ArenaAllocator;
const Dir = std.fs.Dir; const Dir = std.fs.Dir;
const File = std.fs.File; const File = std.fs.File;
const tmpDir = testing.tmpDir; const tmpDir = testing.tmpDir;
@ -19,13 +20,18 @@ test "Dir.Iterator" {
try tmp_dir.dir.makeDir("some_dir"); try tmp_dir.dir.makeDir("some_dir");
var arena = ArenaAllocator.init(testing.allocator);
defer arena.deinit();
var entries = std.ArrayList(Dir.Entry).init(&arena.allocator);
// Create iterator. // Create iterator.
var iter = tmp_dir.dir.iterate(); var iter = tmp_dir.dir.iterate();
var entries = std.ArrayList(Dir.Entry).init(testing.allocator);
defer entries.deinit();
while (try iter.next()) |entry| { while (try iter.next()) |entry| {
try entries.append(entry); // We cannot just store `entry` as on Windows, we're re-using the name buffer
// which means we'll actually share the `name` pointer between entries!
const name = try mem.dupe(&arena.allocator, u8, entry.name);
try entries.append(Dir.Entry{ .name = name, .kind = entry.kind });
} }
testing.expect(entries.items.len == 2); // note that the Iterator skips '.' and '..' testing.expect(entries.items.len == 2); // note that the Iterator skips '.' and '..'