mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-11 11:29:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash with invalid input in fetch()

Browse Source
This commit is contained in:
Jarred Sumner
2023-04-28 13:54:09 -07:00
parent 4515a6373e
commit 396416a91f
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bun.js/webcore/response.zig
View File

@@ -951,7 +951,7 @@ pub const Fetch = struct {
var args = JSC.Node.ArgumentsSlice.from(script_ctx, arguments);
defer args.deinit();
var url: ZigURL = undefined;
var url = ZigURL{};
var first_arg = args.nextEat().?;
var body: AnyBlob = AnyBlob{
.Blob = .{},
@@ -1302,6 +1302,18 @@ pub const Fetch = struct {
var promise = JSPromise.Strong.init(globalThis);
var promise_val = promise.value();
if (url.isEmpty()) {
const err = JSC.toTypeError(.ERR_INVALID_ARG_VALUE, fetch_error_blank_url, .{}, ctx);
return JSPromise.rejectedPromiseValue(globalThis, err).asRef();
}
if (url.protocol.len > 0) {
if (!(url.isHTTP() or url.isHTTPS())) {
const err = JSC.toTypeError(.ERR_INVALID_ARG_VALUE, "protocol must be http: or https:", .{}, ctx);
return JSPromise.rejectedPromiseValue(globalThis, err).asRef();
}
}
if (!method.hasRequestBody() and body.size() > 0) {
const err = JSC.toTypeError(.ERR_INVALID_ARG_VALUE, fetch_error_unexpected_body, .{}, ctx);
return JSPromise.rejectedPromiseValue(globalThis, err).asRef();
@@ -1479,7 +1491,7 @@ pub const FetchEvent = struct {
var existing_response: ?*Response = arguments[0].?.value().as(Response);
if (existing_response == null) {
switch (JSValue.fromRef(arg).jsType()) {
switch (JSValue.fromRef(arg).jsTypeLoose()) {
.JSPromise => {
this.pending_promise = JSValue.fromRef(arg);
},