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

Fix UAF in canary

Browse Source
This commit is contained in:
Jarred Sumner
2022-11-07 00:50:32 -08:00
parent c52d9fd1b6
commit 072cd5a745
5 changed files with 100 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bun.js/javascript.zig
View File

@@ -1220,7 +1220,7 @@ pub const VirtualMachine = struct {
return promise;
}
promise = JSModuleLoader.loadAndEvaluateModule(this.global, &ZigString.init(std.mem.span(main_file_name)));
promise = JSModuleLoader.loadAndEvaluateModule(this.global, ZigString.static(main_file_name));
this.pending_internal_promise = promise;
} else {
promise = JSModuleLoader.loadAndEvaluateModule(this.global, &ZigString.init(this.main));
@@ -1704,7 +1704,7 @@ pub const VirtualMachine = struct {
"pkg",
};
if (error_instance.isCell()) {
if (error_instance != .zero and error_instance.isCell() and error_instance.jsType().canGet()) {
inline for (extra_fields) |field| {
if (error_instance.get(this.global, field)) |value| {
if (!value.isEmptyOrUndefinedOrNull()) {