Commit 55bced9563daba677bd71c3f93df774092fb2205 | zig

author	Andrew Kelley <andrew@ziglang.org> 2025-07-09 18:38:46-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-07-09 20:01:15-07:00
log	55bced9563daba677bd71c3f93df774092fb2205
tree	6dc8d14d78949e880c442c43660395fac356d3c5
parent	9e52febeebe2a5554e67a961476e19aa01268cb4

std.fs.File.Writer: fix splat alias bug

same deal as previous commit

1 files changed, 11 insertions(+), 13 deletions(-)

lib
- std
  - fs
    File.zig

lib/std/fs/File.zig+11-13

 @@ -1728,25 +1728,22 @@ pub const Writer = struct {
             iovecs[len] = .{ .base = buffered.ptr, .len = buffered.len };
             len += 1;
         }
-        for (data) |d| {
+        for (data[0 .. data.len - 1]) |d| {
             if (d.len == 0) continue;
             iovecs[len] = .{ .base = d.ptr, .len = d.len };
             len += 1;
             if (iovecs.len - len == 0) break;
         }
-        if (len == 0) return 0;
         const pattern = data[data.len - 1];
-        switch (splat) {
+        if (iovecs.len - len != 0) switch (splat) {
-            0 => if (iovecs[len - 1].base == pattern.ptr) {
+            0 => {},
-                len -= 1;
+            1 => if (pattern.len != 0) {
+                iovecs[len] = .{ .base = pattern.ptr, .len = pattern.len };
+                len += 1;
             },
-            1 => {},
             else => switch (pattern.len) {
                 0 => {},
-                1 => memset: {
+                1 => {
-                    // Replace the 1-byte buffer with a bigger one.
-                    if (iovecs[len - 1].base == pattern.ptr) len -= 1;
-                    if (iovecs.len - len == 0) break :memset;
                     const splat_buffer_candidate = io_w.buffer[io_w.end..];
                     var backup_buffer: [64]u8 = undefined;
                     const splat_buffer = if (splat_buffer_candidate.len >= backup_buffer.len)
 @@ -1770,13 +1767,14 @@ pub const Writer = struct {
                         len += 1;
                     }
                 },
-                else => for (0..splat - 1) |_| {
+                else => for (0..splat) |_| {
-                    if (iovecs.len - len == 0) break;
                     iovecs[len] = .{ .base = pattern.ptr, .len = pattern.len };
                     len += 1;
+                    if (iovecs.len - len == 0) break;
                 },
             },
-        }
+        };
+        if (len == 0) return 0;
         switch (w.mode) {
             .positional, .positional_reading => {
                 const n = std.posix.pwritev(handle, iovecs[0..len], w.pos) catch |err| switch (err) {