mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

http.BodyWriter: improve clarity of chunked state machine

Browse source 
This is theoretically a bugfix as well, since it enforces the correct
limit on the first write after writing the header. This theoretical bug
hasn't been hit in practice though as far as I know.
This commit is contained in:
Isaac Freund 2025-08-17 09:45:08 +02:00
parent 623290ea9b
commit c315f2bc2e
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/std/http.zig
View file

@ -864,7 +864,7 @@ pub const BodyWriter = struct {
const bw = w.http_protocol_output; const bw = w.http_protocol_output;
switch (w.state.chunk_len) { switch (w.state.chunk_len) {
0 => {}, 0 => {},
1 => try bw.writeByte('\n'), 1 => unreachable, // Wrote more data than specified in chunk header.
2 => try bw.writeAll("\r\n"), 2 => try bw.writeAll("\r\n"),
else => unreachable, // An earlier write call indicated more data would follow. else => unreachable, // An earlier write call indicated more data would follow.
} }
@ -963,17 +963,15 @@ pub const BodyWriter = struct {
return error.Unimplemented; return error.Unimplemented;
}; };
const out = bw.http_protocol_output; const out = bw.http_protocol_output;
switch (bw.state.chunk_len) { l: switch (bw.state.chunk_len) {
0 => { 0 => {
const header_buf = try out.writableArray(chunk_header_template.len); const header_buf = try out.writableArray(chunk_header_template.len);
@memcpy(header_buf, chunk_header_template); @memcpy(header_buf, chunk_header_template);
writeHex(header_buf[0..chunk_len_digits], data_len); writeHex(header_buf[0..chunk_len_digits], data_len);
const n = try out.sendFileHeader(w.buffered(), file_reader, limit); bw.state.chunk_len = data_len + 2;
bw.state.chunk_len = data_len + 2 - n; continue :l bw.state.chunk_len;
const ret = w.consume(n);
return ret;
}, },
1 => unreachable, 1 => unreachable, // Wrote more data than specified in chunk header.
2 => { 2 => {
try out.writeAll("\r\n"); try out.writeAll("\r\n");
bw.state.chunk_len = 0; bw.state.chunk_len = 0;
@ -1003,11 +1001,10 @@ pub const BodyWriter = struct {
const header_buf = try out.writableArray(chunk_header_template.len); const header_buf = try out.writableArray(chunk_header_template.len);
@memcpy(header_buf, chunk_header_template); @memcpy(header_buf, chunk_header_template);
writeHex(header_buf[0..chunk_len_digits], data_len); writeHex(header_buf[0..chunk_len_digits], data_len);
const n = try out.writeSplatHeader(w.buffered(), data, splat); bw.state.chunk_len = data_len + 2;
bw.state.chunk_len = data_len + 2 - n; continue :l bw.state.chunk_len;
return w.consume(n);
}, },
1 => unreachable, 1 => unreachable, // Wrote more data than specified in chunk header.
2 => { 2 => {
try out.writeAll("\r\n"); try out.writeAll("\r\n");
bw.state.chunk_len = 0; bw.state.chunk_len = 0;