Skip to content

Don't emit incorrect empty chunk #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2025
Merged

Don't emit incorrect empty chunk #511

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions src/http/client.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,24 +1342,38 @@ const Reader = struct {

const size = self.size.?;
const missing = self.missing;

if (data.len >= missing) {
// we have a complete chunk;
var chunk: ?[]u8 = data;
self.size = null;
self.missing = 0;
if (missing == 1) {
const last = missing - 1;
if (data[last] != '\n') {
if (data[0] != '\n') {
return error.InvalidChunk;
}
chunk = null;
} else {
const last = missing - 2;
if (data[last] != '\r' or data[missing - 1] != '\n') {
if (data.len == 1) {
return .{ true, .{ .data = null, .done = size == 0, .unprocessed = null } };
}
return self.process(data[1..]);
}

if (missing == 2) {
if (data[0] != '\r' or data[1] != '\n') {
return error.InvalidChunk;
}
chunk = if (last == 0) null else data[0..last];

if (data.len == 2) {
return .{ true, .{ .data = null, .done = size == 0, .unprocessed = null } };
}
return self.process(data[2..]);
}
self.size = null;
self.missing = 0;

// we have a complete chunk;
var chunk: ?[]u8 = data;
const last = missing - 2;
if (data[last] != '\r' or data[missing - 1] != '\n') {
return error.InvalidChunk;
}
chunk = if (last == 0) null else data[0..last];

const unprocessed = data[missing..];

Expand Down