Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make v8 stack trace parser code more careful #14205

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Make v8 stack trace parser code more careful #14205

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c89c585
Make v8 stack trace parser code more careful
Jarred-Sumner Sep 27, 2024
b492364
Merge branch 'main' into jarred/v8-stack-crash
Jarred-Sumner Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 30 additions & 28 deletions src/bun.js/bindings/bindings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4212,7 +4212,7 @@ class V8StackTraceIterator {
end = offset;
}

if (end == start || start == WTF::notFound) {
if (start >= end || start == WTF::notFound) {
return false;
}

Expand Down Expand Up @@ -4465,42 +4465,44 @@ static void fromErrorInstance(ZigException* except, JSC::JSGlobalObject* global,
if (JSC::JSValue stackValue = obj->getIfPropertyExists(global, vm.propertyNames->stack)) {
if (stackValue.isString()) {
WTF::String stack = stackValue.toWTFString(global);
if (!stack.isEmpty()) {

V8StackTraceIterator iterator(stack);
const uint8_t frame_count = except->stack.frames_len;
V8StackTraceIterator iterator(stack);
const uint8_t frame_count = except->stack.frames_len;

except->stack.frames_len = 0;
except->stack.frames_len = 0;

iterator.forEachFrame([&](const V8StackTraceIterator::StackFrame& frame, bool& stop) -> void {
ASSERT(except->stack.frames_len < frame_count);
auto& current = except->stack.frames_ptr[except->stack.frames_len];
current = {};
iterator.forEachFrame([&](const V8StackTraceIterator::StackFrame& frame, bool& stop) -> void {
ASSERT(except->stack.frames_len < frame_count);
auto& current = except->stack.frames_ptr[except->stack.frames_len];
current = {};

String functionName = frame.functionName.toString();
String sourceURL = frame.sourceURL.toString();
current.function_name = Bun::toStringRef(functionName);
current.source_url = Bun::toStringRef(sourceURL);
current.position.line_zero_based = frame.lineNumber.zeroBasedInt();
current.position.column_zero_based = frame.columnNumber.zeroBasedInt();
String functionName = frame.functionName.toString();
String sourceURL = frame.sourceURL.toString();
current.function_name = Bun::toStringRef(functionName);
current.source_url = Bun::toStringRef(sourceURL);
current.position.line_zero_based = frame.lineNumber.zeroBasedInt();
current.position.column_zero_based = frame.columnNumber.zeroBasedInt();

current.remapped = true;
current.remapped = true;

if (frame.isConstructor) {
current.code_type = ZigStackFrameCodeConstructor;
} else if (frame.isGlobalCode) {
current.code_type = ZigStackFrameCodeGlobal;
}
if (frame.isConstructor) {
current.code_type = ZigStackFrameCodeConstructor;
} else if (frame.isGlobalCode) {
current.code_type = ZigStackFrameCodeGlobal;
}

except->stack.frames_len += 1;
except->stack.frames_len += 1;

stop = except->stack.frames_len >= frame_count;
});
stop = except->stack.frames_len >= frame_count;
});

if (except->stack.frames_len > 0) {
getFromSourceURL = false;
except->remapped = true;
} else {
except->stack.frames_len = frame_count;
if (except->stack.frames_len > 0) {
getFromSourceURL = false;
except->remapped = true;
} else {
except->stack.frames_len = frame_count;
}
}
}
}
Expand Down