diff --git a/src/browser/mime.zig b/src/browser/mime.zig
index 793e3cef..97ac88f6 100644
--- a/src/browser/mime.zig
+++ b/src/browser/mime.zig
@@ -24,6 +24,7 @@ pub const Mime = struct {
// IANA defines max. charset value length as 40.
// We keep 41 for null-termination since HTML parser expects in this format.
charset: [41]u8 = default_charset,
+ charset_len: usize = 5,
/// String "UTF-8" continued by null characters.
pub const default_charset = .{ 'U', 'T', 'F', '-', '8' } ++ .{0} ** 36;
@@ -53,7 +54,7 @@ pub const Mime = struct {
other: struct { type: []const u8, sub_type: []const u8 },
};
- pub fn contentTypeString(mime: *const Mime) [:0]const u8 {
+ pub fn contentTypeString(mime: *const Mime) []const u8 {
return switch (mime.content_type) {
.text_xml => "text/xml",
.text_html => "text/html",
@@ -66,8 +67,12 @@ pub const Mime = struct {
}
/// Returns the null-terminated charset value.
- pub fn charsetString(mime: *const Mime) [:0]const u8 {
- return @ptrCast(&mime.charset);
+ pub fn charsetStringZ(mime: *const Mime) [:0]const u8 {
+ return mime.charset[0..mime.charset_len :0];
+ }
+
+ pub fn charsetString(mime: *const Mime) []const u8 {
+ return mime.charset[0..mime.charset_len];
}
/// Removes quotes of value if quotes are given.
@@ -111,6 +116,7 @@ pub const Mime = struct {
const params = trimLeft(normalized[type_len..]);
var charset: [41]u8 = undefined;
+ var charset_len: usize = undefined;
var it = std.mem.splitScalar(u8, params, ';');
while (it.next()) |attr| {
@@ -136,6 +142,7 @@ pub const Mime = struct {
@memcpy(charset[0..attribute_value.len], attribute_value);
// Null-terminate right after attribute value.
charset[attribute_value.len] = 0;
+ charset_len = attribute_value.len;
},
}
}
@@ -143,6 +150,7 @@ pub const Mime = struct {
return .{
.params = params,
.charset = charset,
+ .charset_len = charset_len,
.content_type = content_type,
};
}
@@ -523,9 +531,9 @@ fn expect(expected: Expectation, input: []const u8) !void {
if (expected.charset) |ec| {
// We remove the null characters for testing purposes here.
- try testing.expectEqual(ec, actual.charsetString()[0..ec.len]);
+ try testing.expectEqual(ec, actual.charsetString());
} else {
const m: Mime = .unknown;
- try testing.expectEqual(m.charsetString(), actual.charsetString());
+ try testing.expectEqual(m.charsetStringZ(), actual.charsetStringZ());
}
}
diff --git a/src/browser/page.zig b/src/browser/page.zig
index 05bd528f..7281a9c6 100644
--- a/src/browser/page.zig
+++ b/src/browser/page.zig
@@ -740,14 +740,14 @@ pub const Page = struct {
log.debug(.http, "navigate first chunk", .{ .content_type = mime.content_type, .len = data.len });
self.mode = switch (mime.content_type) {
- .text_html => .{ .html = try parser.Parser.init(mime.charsetString()) },
+ .text_html => .{ .html = try parser.Parser.init(mime.charsetStringZ()) },
.application_json,
.text_javascript,
.text_css,
.text_plain,
=> blk: {
- var p = try parser.Parser.init(mime.charsetString());
+ var p = try parser.Parser.init(mime.charsetStringZ());
try p.process("");
break :blk .{ .text = p };
},
diff --git a/src/browser/xhr/xhr.zig b/src/browser/xhr/xhr.zig
index ee6a6c04..dfc9ca99 100644
--- a/src/browser/xhr/xhr.zig
+++ b/src/browser/xhr/xhr.zig
@@ -678,7 +678,7 @@ pub const XMLHttpRequest = struct {
}
var fbs = std.io.fixedBufferStream(self.response_bytes.items);
- const doc = parser.documentHTMLParse(fbs.reader(), mime.charsetString()) catch {
+ const doc = parser.documentHTMLParse(fbs.reader(), mime.charsetStringZ()) catch {
self.response_obj = .{ .Failure = {} };
return;
};
diff --git a/src/cdp/domains/network.zig b/src/cdp/domains/network.zig
index 3d32f191..0b435e7d 100644
--- a/src/cdp/domains/network.zig
+++ b/src/cdp/domains/network.zig
@@ -412,7 +412,7 @@ const TransferAsResponseWriter = struct {
try jws.objectField("mimeType");
try jws.write(mime.contentTypeString());
try jws.objectField("charset");
- try jws.write(mime.charsetString()[0..]);
+ try jws.write(mime.charsetString());
}
{