Skip to content

Lightpanda: the headless browser designed for AI and automation

webapi: encode non-breaking spaces in serialized attribute values

Jay Hemnani099665edd8c0
diff --git a/src/browser/tests/element/element.html b/src/browser/tests/element/element.html
index 84526711f..7d4f34475 100644
--- a/src/browser/tests/element/element.html
+++ b/src/browser/tests/element/element.html
@@ -64,6 +64,14 @@
const p = document.createElement('p');
p.textContent = 'XAnge\xa0Privacy';
testing.expectEqual('<p>XAnge&nbsp;Privacy</p>', p.outerHTML);
+
+ // Attribute values encode it too
+ const a = document.createElement('a');
+ a.setAttribute('title', 'a\xa0b');
+ a.setAttribute('data-x', '\xa0"\xa0');
+ testing.expectEqual('<a title="a&nbsp;b" data-x="&nbsp;&quot;&nbsp;"></a>', a.outerHTML);
+ div.innerHTML = '<span title="x&nbsp;y">z</span>';
+ testing.expectEqual('<span title="x&nbsp;y">z</span>', div.innerHTML);
</script>
<script id=element>
diff --git a/src/browser/webapi/element/Attribute.zig b/src/browser/webapi/element/Attribute.zig
index ea2434535..764c36c4e 100644
--- a/src/browser/webapi/element/Attribute.zig
+++ b/src/browser/webapi/element/Attribute.zig
@@ -747,7 +747,7 @@ fn formatAttribute(name: []const u8, value: []const u8, writer: *std.Io.Writer)
}
try writer.writeByte('"');
- const offset = std.mem.findAny(u8, value, "`' &\"<>=") orelse {
+ const offset = std.mem.findAny(u8, value, "`' &\"<>=\xc2") orelse {
try writer.writeAll(value);
return writer.writeByte('"');
};
@@ -790,28 +790,29 @@ const boolean_attributes_lookup = std.StaticStringMap(void).initComptime(blk: {
fn writeEscapedAttributeValue(value: []const u8, first_offset: usize, writer: *std.Io.Writer) !void {
// Write everything before the first special character
try writer.writeAll(value[0..first_offset]);
- try writer.writeAll(switch (value[first_offset]) {
- '&' => "&amp;",
- '"' => "&quot;",
- '<' => "&lt;",
- '>' => "&gt;",
- '=' => "=",
- ' ' => " ",
- '`' => "`",
- '\'' => "'",
- else => unreachable,
- });
- var remaining = value[first_offset + 1 ..];
- while (std.mem.findAny(u8, remaining, "&\"<>")) |offset| {
+ var remaining = value[first_offset..];
+ while (std.mem.findAny(u8, remaining, "&\"<>\xc2")) |offset| {
try writer.writeAll(remaining[0..offset]);
- try writer.writeAll(switch (remaining[offset]) {
+ const escaped: []const u8 = switch (remaining[offset]) {
'&' => "&amp;",
'"' => "&quot;",
'<' => "&lt;",
'>' => "&gt;",
+ 0xC2 => {
+ // non breaking space (U+00A0, C2 A0 in UTF-8)
+ if (remaining.len > offset + 1 and remaining[offset + 1] == 0xA0) {
+ try writer.writeAll("&nbsp;");
+ remaining = remaining[offset + 2 ..];
+ } else {
+ try writer.writeByte(0xC2);
+ remaining = remaining[offset + 1 ..];
+ }
+ continue;
+ },
else => unreachable,
- });
+ };
+ try writer.writeAll(escaped);
remaining = remaining[offset + 1 ..];
}