Skip to content

Lightpanda: the headless browser designed for AI and automation

crash: fix file->blob memory layout

Karl Seguina451e4ab6304
diff --git a/src/browser/tests/net/response.html b/src/browser/tests/net/response.html
index 17f71e5c2..1d75fa142 100644
--- a/src/browser/tests/net/response.html
+++ b/src/browser/tests/net/response.html
@@ -146,6 +146,14 @@
);
const fd9 = await res9.formData();
+ // A part with a filename parses into a File.
+ const res10 = new Response(
+ '--B\r\nContent-Disposition: form-data; name="f"; filename="a.txt"\r\nContent-Type: text/plain\r\n\r\nhello\r\n--B--\r\n',
+ { headers: { 'Content-Type': 'multipart/form-data; boundary=B' } },
+ );
+ const file10 = (await res10.formData()).get('f');
+ const text10 = await file10.text();
+
state.resolve();
await state.done(() => {
testing.expectEqual(true, fd1 instanceof FormData);
@@ -173,6 +181,11 @@
testing.expectEqual(0, [...fd7].length);
testing.expectEqual(true, rejected8);
testing.expectEqual('v', fd9.get('n'));
+
+ testing.expectEqual(true, file10 instanceof File);
+ testing.expectEqual('a.txt', file10.name);
+ testing.expectEqual('text/plain', file10.type);
+ testing.expectEqual('hello', text10);
});
</script>
diff --git a/src/browser/webapi/net/FormData.zig b/src/browser/webapi/net/FormData.zig
index 185341f7f..f0321a646 100644
--- a/src/browser/webapi/net/FormData.zig
+++ b/src/browser/webapi/net/FormData.zig
@@ -700,18 +700,10 @@ fn parseMultipart(self: *FormData, bytes: []const u8, boundary: []const u8, exec
// Got a file.
if (parsed.filename) |filename| {
- const blob = try Blob.initFromBytes(content, content_type, exec);
- errdefer blob.deinit(exec.page);
-
- const file = try blob._arena.create(File);
- file.* = .{
- ._proto = blob,
- ._name = try blob._arena.dupe(u8, try decodeMultipartName(self._arena.allocator(), filename)),
- ._last_modified = @intCast(lp.datetime.milliTimestamp(.real)),
- };
- blob._type = .{ .file = file };
+ const decoded_filename = try decodeMultipartName(self._arena.allocator(), filename);
+ const file = try fileFromBytes(content, content_type, decoded_filename, exec);
+ errdefer file.releaseRef(exec.page);
- file.acquireRef();
try self._entries.append(self._arena.allocator(), .{
.name = try String.init(self._arena.allocator(), name, .{}),
.value = .{ .file = file },