Merge remote-tracking branch 'origin/master' into llvm10

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/std/cstr.zig b/lib/std/cstr.zig
index 5194dc1a13..5d16e9387b 100644
--- a/lib/std/cstr.zig
+++ b/lib/std/cstr.zig
@@ -41,9 +41,8 @@ pub fn addNullByte(allocator: *mem.Allocator, slice: []const u8) ![:0]u8 {
 }
 
 test "addNullByte" {
-    var buf: [30]u8 = undefined;
-    const allocator = &std.heap.FixedBufferAllocator.init(&buf).allocator;
-    const slice = try addNullByte(allocator, "hello"[0..4]);
+    const slice = try addNullByte(std.testing.allocator, "hello"[0..4]);
+    defer std.testing.allocator.free(slice);
     testing.expect(slice.len == 4);
     testing.expect(slice[4] == 0);
 }