zig

commit ec5cdb2fe394b6a8ca3d30b7652049f39c1aecdb (tree)
parent 91640f5f819de5bb6211d6bfa3c778737fa822aa
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Tue, 22 Jul 2025 17:06:25 -0700

std: fix deprecated writer not handling the buffer

Diffstat:
M
lib/std/Io.zig
 | 
7
++++++-
M
lib/std/Io/DeprecatedWriter.zig
 | 
7
++++++-

2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/lib/std/Io.zig b/lib/std/Io.zig
@@ -419,9 +419,14 @@ pub fn GenericWriter(
             new_interface: Writer,
             err: ?Error = null,
 
-            fn drain(w: *Writer, data: []const []const u8, splat: usize) Writer.Error!usize {
+            fn drain(w: *std.io.Writer, data: []const []const u8, splat: usize) std.io.Writer.Error!usize {
                 _ = splat;
                 const a: *@This() = @alignCast(@fieldParentPtr("new_interface", w));
+                const buffered = w.buffered();
+                if (buffered.len != 0) return w.consume(a.derp_writer.write(buffered) catch |err| {
+                    a.err = err;
+                    return error.WriteFailed;
+                });
                 return a.derp_writer.write(data[0]) catch |err| {
                     a.err = err;
                     return error.WriteFailed;
diff --git a/lib/std/Io/DeprecatedWriter.zig b/lib/std/Io/DeprecatedWriter.zig
@@ -100,7 +100,12 @@ pub const Adapter = struct {
 
     fn drain(w: *std.io.Writer, data: []const []const u8, splat: usize) std.io.Writer.Error!usize {
         _ = splat;
-        const a: *@This() = @fieldParentPtr("new_interface", w);
+        const a: *@This() = @alignCast(@fieldParentPtr("new_interface", w));
+        const buffered = w.buffered();
+        if (buffered.len != 0) return w.consume(a.derp_writer.write(buffered) catch |err| {
+            a.err = err;
+            return error.WriteFailed;
+        });
         return a.derp_writer.write(data[0]) catch |err| {
             a.err = err;
             return error.WriteFailed;