eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-25 17:15:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

devtools: Fix recursion in debugger (#44024)

Browse Source 
Fix recursion causing panic in debugger

Testing: Current tests are passing, also manual testing 
Fixes: part of #36027

Signed-off-by: atbrakhi <atbrakhi@igalia.com>
Co-authored-by: eri <eri@igalia.com>
This commit is contained in:
atbrakhi
2026-04-08 17:29:20 +02:00
committed by GitHub
parent 78c9fe2a4c
commit e50cfa7af6
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
components/default-resources/resources/debugger.js
View File

@@ -86,7 +86,7 @@ const previewers = {
// Convert debuggee value to property descriptor value
// <https://searchfox.org/firefox-main/source/devtools/server/actors/object/utils.js#116>
function createValueGrip(value) {
function createValueGrip(value, depth = 0) {
switch (typeof value) {
case "undefined":
return { valueType: "undefined" };
@@ -105,7 +105,7 @@ function createValueGrip(value) {
return {
valueType: "object",
objectClass: value.class,
preview: getPreview(value),
preview: getPreview(value, depth),
};
default:
return { valueType: "string", stringValue: String(value) };
@@ -114,7 +114,7 @@ function createValueGrip(value) {
// Extract own properties from a debuggee object
// <https://firefox-source-docs.mozilla.org/devtools-user/debugger-api/debugger.object/index.html#function-properties-of-the-debugger-object-prototype>
function extractOwnProperties(obj, maxItems = OBJECT_PREVIEW_MAX_ITEMS) {
function extractOwnProperties(obj, depth, maxItems = OBJECT_PREVIEW_MAX_ITEMS) {
const ownProperties = [];
let totalLength = 0;
@@ -138,16 +138,16 @@ function extractOwnProperties(obj, maxItems = OBJECT_PREVIEW_MAX_ITEMS) {
enumerable: desc.enumerable ?? false,
writable: desc.writable ?? false,
isAccessor: desc.get !== undefined || desc.set !== undefined,
value: createValueGrip(undefined),
value: createValueGrip(undefined, depth + 1),
};
if (desc.value !== undefined) {
prop.value = createValueGrip(desc.value);
prop.value = createValueGrip(desc.value, depth + 1);
} else if (desc.get) {
try {
const result = desc.get.call(obj);
if (result && "return" in result) {
prop.value = createValueGrip(result.return);
prop.value = createValueGrip(result.return, depth + 1);
}
} catch (e) { }
}
@@ -164,25 +164,31 @@ function extractOwnProperties(obj, maxItems = OBJECT_PREVIEW_MAX_ITEMS) {
}
// <https://searchfox.org/mozilla-central/source/devtools/server/actors/object/previewers.js#125>
previewers.Function.push(function FunctionPreviewer(obj) {
const { ownProperties, ownPropertiesLength } = extractOwnProperties(obj);
previewers.Function.push(function FunctionPreviewer(obj, depth) {
let function_details = {
name: obj.name,
displayName: obj.displayName,
parameterNames: obj.parameterNames,
isAsync: obj.isAsyncFunction,
isGenerator: obj.isGeneratorFunction,
}
if (depth > 1) {
return { kind: "Object", function: function_details };
}
const { ownProperties, ownPropertiesLength } = extractOwnProperties(obj, depth);
return {
kind: "Object",
ownProperties,
ownPropertiesLength,
function: {
name: obj.name,
displayName: obj.displayName,
parameterNames: obj.parameterNames,
isAsync: obj.isAsyncFunction,
isGenerator: obj.isGeneratorFunction,
}
function: funtion_details
};
});
// <https://searchfox.org/mozilla-central/source/devtools/server/actors/object/previewers.js#172>
// TODO: Add implementation for showing Array items
previewers.Array.push(function ArrayPreviewer(obj) {
previewers.Array.push(function ArrayPreviewer(obj, depth) {
const lengthDescriptor = obj.getOwnPropertyDescriptor("length");
const length = lengthDescriptor ? lengthDescriptor.value : 0;
@@ -194,8 +200,12 @@ previewers.Array.push(function ArrayPreviewer(obj) {
// Generic fallback for object previewer
// <https://searchfox.org/mozilla-central/source/devtools/server/actors/object/previewers.js#856>
previewers.Object.push(function ObjectPreviewer(obj) {
const { ownProperties, ownPropertiesLength } = extractOwnProperties(obj);
previewers.Object.push(function ObjectPreviewer(obj, depth) {
if (depth > 1) {
return { kind: "Object" };
}
const { ownProperties, ownPropertiesLength } = extractOwnProperties(obj, depth);
return {
kind: "Object",
ownProperties,
@@ -203,13 +213,13 @@ previewers.Object.push(function ObjectPreviewer(obj) {
};
});
function getPreview(obj) {
function getPreview(obj, depth) {
const className = obj.class;
// <https://searchfox.org/mozilla-central/source/devtools/server/actors/object.js#295>
const typePreviewers = previewers[className] || previewers.Object;
for (const previewer of typePreviewers) {
const result = previewer(obj);
const result = previewer(obj, depth);
if (result) return result;
}