authorgravatar for quae@daurnimator.comdaurnimator <quae@daurnimator.com> 2020-11-19 02:10:14+11:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-01-11 16:47:48-07:00
log8695b9fbe781ea030bafb4f6272202b9115ba46b
tree0438310f2c5a1c77e9bfc1532e315a7a8c2bf581
parent0ab8ae944cd2b48c783c4ca8963997b6af207d5e

std: use reader.skipBytes to avoid infinite loop in writeFileAllUnseekable

skipBytes correctly handles EOF for us

1 files changed, 3 insertions(+), 10 deletions(-)

lib/std/fs/file.zig+3-10
...@@ -698,7 +698,7 @@ pub const File = struct {...@@ -698,7 +698,7 @@ pub const File = struct {
698 header_count: usize = 0,698 header_count: usize = 0,
699 };699 };
700700
701 pub const WriteFileError = ReadError || WriteError;701 pub const WriteFileError = ReadError || error{EndOfStream} || WriteError;
702702
703 pub fn writeFileAll(self: File, in_file: File, args: WriteFileOptions) WriteFileError!void {703 pub fn writeFileAll(self: File, in_file: File, args: WriteFileOptions) WriteFileError!void {
704 return self.writeFileAllSendfile(in_file, args) catch |err| switch (err) {704 return self.writeFileAllSendfile(in_file, args) catch |err| switch (err) {
...@@ -722,16 +722,9 @@ pub const File = struct {...@@ -722,16 +722,9 @@ pub const File = struct {
722722
723 try self.writevAll(headers);723 try self.writevAll(headers);
724724
725 try in_file.reader().skipBytes(args.in_offset, .{ .buf_size = 4096 });
726
725 var buffer: [4096]u8 = undefined;727 var buffer: [4096]u8 = undefined;
726 {
727 var index: usize = 0;
728 // Skip in_offset bytes.
729 while (index < args.in_offset) {
730 const ask = math.min(buffer.len, args.in_offset - index);
731 const amt = try in_file.read(buffer[0..ask]);
732 index += amt;
733 }
734 }
735 const in_len = args.in_len orelse math.maxInt(u64);728 const in_len = args.in_len orelse math.maxInt(u64);
736 var index: usize = 0;729 var index: usize = 0;
737 while (index < in_len) {730 while (index < in_len) {