[mono][debugger] fix exception while decoding value that has a byref field#75774

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

Merged
thaystg merged 2 commits into from
Sep 26, 2022
Merged

[mono][debugger] fix exception while decoding value that has a byref field #75774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
317f16f
fix exception while decoding value that has a byref field
thaystg Sep 16, 2022
7d06ea6
Apply suggestions from code review
thaystg Sep 23, 2022
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
11 changes: 10 additions & 1 deletion src/mono/mono/component/debugger-agent.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5078,6 +5078,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
/* This can happen with compiler generated locals */
//PRINT_MSG ("%s\n", mono_type_full_name (t));
buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
if (CHECK_PROTOCOL_VERSION (2, 59))
buffer_add_info_for_null_value (buf, t, domain);
return;
}
g_assert (*(void**)addr);
Expand DownExpand Up@@ -5231,6 +5233,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
} else {
/* The client can't handle PARENT_VTYPE */
buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
if (CHECK_PROTOCOL_VERSION (2, 59))
buffer_add_info_for_null_value (buf, t, domain);
}
break;
} else {
Expand DownExpand Up@@ -5613,6 +5617,11 @@ decode_value (MonoType *t, MonoDomain *domain, gpointer void_addr, gpointer void
ErrorCode err;
int type = decode_byte (buf, &buf, limit);

if (m_type_is_byref (t)) {
*(guint8**)addr = (guint8 *)g_malloc (sizeof (void*)); //when the object will be deleted it will delete this memory allocated here together?
addr = *(guint8**)addr;
}

if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type_internal (t))) {
MonoType *targ = t->data.generic_class->context.class_inst->type_argv [0];
guint8 *nullable_buf;
Expand DownExpand Up@@ -6082,7 +6091,7 @@ mono_do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, gu
}
} else {
if (!(m->flags & METHOD_ATTRIBUTE_STATIC) || (m->flags & METHOD_ATTRIBUTE_STATIC && !CHECK_PROTOCOL_VERSION (2, 59))) { //on icordbg I couldn't find an object when invoking a static method maybe I can change this later
err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
if (err != ERR_NONE)
return err;
}
Expand Down
8 changes: 8 additions & 0 deletions src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1608,6 +1608,14 @@ public async Task<string> GetValueFromDebuggerDisplayAttribute(DotnetObjectId do
{
dispAttrStr = dispAttrStr.Replace(",nq", "");
}
if (dispAttrStr.Contains(", raw"))

@lewinglewingSep 23, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe turn all these into a regex (and or use ordinal)

{
dispAttrStr = dispAttrStr.Replace(", raw", "");
}
if (dispAttrStr.Contains(",raw"))
{
dispAttrStr = dispAttrStr.Replace(",raw", "");
}
expr = "$\"" + dispAttrStr + "\"";
JObject retValue = await resolver.Resolve(expr, token);
retValue ??= await ExpressionEvaluator.CompileAndRunTheExpression(expr, resolver, logger, token);
Expand Down
25 changes: 25 additions & 0 deletions src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,5 +1100,30 @@ await EvaluateAndCheck(
bp.Value["locations"][0]["columnNumber"].Value<int>(),
$"DebuggerTests.CheckChineseCharacterInPath.Evaluate");
}

[Fact]
public async Task InspectReadOnlySpan()
{
var expression = $"{{ invoke_static_method('[debugger-test] ReadOnlySpanTest:Run'); }}";

await EvaluateAndCheck(
"window.setTimeout(function() {" + expression + "; }, 1);",
"dotnet://debugger-test.dll/debugger-test.cs", 1371, 8,
"ReadOnlySpanTest.CheckArguments",
wait_for_event_fn: async (pause_location) =>
{
var id = pause_location["callFrames"][0]["callFrameId"].Value<string>();
await EvaluateOnCallFrameAndCheck(id,
("parameters.ToString()", TString("System.ReadOnlySpan<Object>[1]"))
);
}
);
await StepAndCheck(StepKind.Resume, "dotnet://debugger-test.dll/debugger-test.cs", 1363, 8, "ReadOnlySpanTest.Run",
locals_fn: async (locals) =>
{
await CheckValueType(locals, "var1", "System.ReadOnlySpan<object>", description: "System.ReadOnlySpan<Object>[0]");
}
);
}
}
}
17 changes: 17 additions & 0 deletions src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1354,4 +1354,21 @@ public void CallMethod()
}

public int myField;
}
public class ReadOnlySpanTest
{
public static void Run()
{
Invoke(new string[] {"TEST"});
ReadOnlySpan<object> var1 = new ReadOnlySpan<object>();
System.Diagnostics.Debugger.Break();
}
public static void Invoke(object[] parameters)
{
CheckArguments(parameters);
}
public static void CheckArguments(ReadOnlySpan<object> parameters)
{
System.Diagnostics.Debugger.Break();
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[mono][debugger] fix exception while decoding value that has a byref field#75774

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

 Merged

thaystg
merged 2 commits into

from

Sep 26, 2022
 Merged


[mono][debugger] fix exception while decoding value that has a byref field
#75774
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
317f16f

fix exception while decoding value that has a byref field


thaystg Sep 16, 2022
7d06ea6

Apply suggestions from code review


thaystg Sep 23, 2022

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


11 changes: 10 additions & 1 deletion
src/mono/mono/component/debugger-agent.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5078,6 +5078,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 /* This can happen with compiler generated locals */
 //PRINT_MSG ("%s\n", mono_type_full_name (t));
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 return;
 }
 g_assert (*(void**)addr);
Expand DownExpand Up@@ -5231,6 +5233,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 } else {
 /* The client can't handle PARENT_VTYPE */
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 }
 break;
 } else {
Expand DownExpand Up@@ -5613,6 +5617,11 @@ decode_value (MonoType *t, MonoDomain *domain, gpointer void_addr, gpointer void
	ErrorCode err;
	int type = decode_byte (buf, &buf, limit);

	if (m_type_is_byref (t)) {
 *(guint8**)addr = (guint8 *)g_malloc (sizeof (void*)); //when the object will be deleted it will delete this memory allocated here together?
 addr = *(guint8**)addr;
	}

	if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type_internal (t))) {
 MonoType *targ = t->data.generic_class->context.class_inst->type_argv [0];
 guint8 *nullable_buf;
Expand DownExpand Up@@ -6082,7 +6091,7 @@ mono_do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, gu
 }
	} else {
 if (!(m->flags & METHOD_ATTRIBUTE_STATIC) || (m->flags & METHOD_ATTRIBUTE_STATIC && !CHECK_PROTOCOL_VERSION (2, 59))) { //on icordbg I couldn't find an object when invoking a static method maybe I can change this later
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 if (err != ERR_NONE)
 return err;
 }
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1608,6 +1608,14 @@ public async Task<string> GetValueFromDebuggerDisplayAttribute(DotnetObjectId do
 {
 dispAttrStr = dispAttrStr.Replace(",nq", "");
 }
 if (dispAttrStr.Contains(", raw"))
@lewinglewingSep 23, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe turn all these into a regex (and or use ordinal)
 {
 dispAttrStr = dispAttrStr.Replace(", raw", "");
 }
 if (dispAttrStr.Contains(",raw"))
 {
 dispAttrStr = dispAttrStr.Replace(",raw", "");
 }
 expr = "$\"" + dispAttrStr + "\"";
 JObject retValue = await resolver.Resolve(expr, token);
 retValue ??= await ExpressionEvaluator.CompileAndRunTheExpression(expr, resolver, logger, token);
Expand Down

25 changes: 25 additions & 0 deletions
src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,5 +1100,30 @@ await EvaluateAndCheck(
 bp.Value["locations"][0]["columnNumber"].Value<int>(),
 $"DebuggerTests.CheckChineseCharacterInPath.Evaluate");
 }

 [Fact]
 public async Task InspectReadOnlySpan()
 {
 var expression = $"{{ invoke_static_method('[debugger-test] ReadOnlySpanTest:Run'); }}";

 await EvaluateAndCheck(
 "window.setTimeout(function() {" + expression + "; }, 1);",
 "dotnet://debugger-test.dll/debugger-test.cs", 1371, 8,
 "ReadOnlySpanTest.CheckArguments",
 wait_for_event_fn: async (pause_location) =>
 {
 var id = pause_location["callFrames"][0]["callFrameId"].Value<string>();
 await EvaluateOnCallFrameAndCheck(id,
 ("parameters.ToString()", TString("System.ReadOnlySpan<Object>[1]"))
 );
 }
 );
 await StepAndCheck(StepKind.Resume, "dotnet://debugger-test.dll/debugger-test.cs", 1363, 8, "ReadOnlySpanTest.Run",
 locals_fn: async (locals) =>
 {
 await CheckValueType(locals, "var1", "System.ReadOnlySpan<object>", description: "System.ReadOnlySpan<Object>[0]");
 }
 );
 }
 }
}

17 changes: 17 additions & 0 deletions
src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1354,4 +1354,21 @@ public void CallMethod()
 }

 public int myField;
}
public class ReadOnlySpanTest
{
 public static void Run()
 {
 Invoke(new string[] {"TEST"});
 ReadOnlySpan<object> var1 = new ReadOnlySpan<object>();
 System.Diagnostics.Debugger.Break();
 }
 public static void Invoke(object[] parameters)
 {
 CheckArguments(parameters);
 }
 public static void CheckArguments(ReadOnlySpan<object> parameters)
 {
 System.Diagnostics.Debugger.Break();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono][debugger] fix exception while decoding value that has a byref field#75774

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

 Merged

thaystg
merged 2 commits into

from

Sep 26, 2022
 Merged


[mono][debugger] fix exception while decoding value that has a byref field
#75774
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
317f16f

fix exception while decoding value that has a byref field


thaystg Sep 16, 2022
7d06ea6

Apply suggestions from code review


thaystg Sep 23, 2022

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


11 changes: 10 additions & 1 deletion
src/mono/mono/component/debugger-agent.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5078,6 +5078,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 /* This can happen with compiler generated locals */
 //PRINT_MSG ("%s\n", mono_type_full_name (t));
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 return;
 }
 g_assert (*(void**)addr);
Expand DownExpand Up@@ -5231,6 +5233,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 } else {
 /* The client can't handle PARENT_VTYPE */
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 }
 break;
 } else {
Expand DownExpand Up@@ -5613,6 +5617,11 @@ decode_value (MonoType *t, MonoDomain *domain, gpointer void_addr, gpointer void
	ErrorCode err;
	int type = decode_byte (buf, &buf, limit);

	if (m_type_is_byref (t)) {
 *(guint8**)addr = (guint8 *)g_malloc (sizeof (void*)); //when the object will be deleted it will delete this memory allocated here together?
 addr = *(guint8**)addr;
	}

	if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type_internal (t))) {
 MonoType *targ = t->data.generic_class->context.class_inst->type_argv [0];
 guint8 *nullable_buf;
Expand DownExpand Up@@ -6082,7 +6091,7 @@ mono_do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, gu
 }
	} else {
 if (!(m->flags & METHOD_ATTRIBUTE_STATIC) || (m->flags & METHOD_ATTRIBUTE_STATIC && !CHECK_PROTOCOL_VERSION (2, 59))) { //on icordbg I couldn't find an object when invoking a static method maybe I can change this later
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 if (err != ERR_NONE)
 return err;
 }
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1608,6 +1608,14 @@ public async Task<string> GetValueFromDebuggerDisplayAttribute(DotnetObjectId do
 {
 dispAttrStr = dispAttrStr.Replace(",nq", "");
 }
 if (dispAttrStr.Contains(", raw"))
@lewinglewingSep 23, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe turn all these into a regex (and or use ordinal)
 {
 dispAttrStr = dispAttrStr.Replace(", raw", "");
 }
 if (dispAttrStr.Contains(",raw"))
 {
 dispAttrStr = dispAttrStr.Replace(",raw", "");
 }
 expr = "$\"" + dispAttrStr + "\"";
 JObject retValue = await resolver.Resolve(expr, token);
 retValue ??= await ExpressionEvaluator.CompileAndRunTheExpression(expr, resolver, logger, token);
Expand Down

25 changes: 25 additions & 0 deletions
src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,5 +1100,30 @@ await EvaluateAndCheck(
 bp.Value["locations"][0]["columnNumber"].Value<int>(),
 $"DebuggerTests.CheckChineseCharacterInPath.Evaluate");
 }

 [Fact]
 public async Task InspectReadOnlySpan()
 {
 var expression = $"{{ invoke_static_method('[debugger-test] ReadOnlySpanTest:Run'); }}";

 await EvaluateAndCheck(
 "window.setTimeout(function() {" + expression + "; }, 1);",
 "dotnet://debugger-test.dll/debugger-test.cs", 1371, 8,
 "ReadOnlySpanTest.CheckArguments",
 wait_for_event_fn: async (pause_location) =>
 {
 var id = pause_location["callFrames"][0]["callFrameId"].Value<string>();
 await EvaluateOnCallFrameAndCheck(id,
 ("parameters.ToString()", TString("System.ReadOnlySpan<Object>[1]"))
 );
 }
 );
 await StepAndCheck(StepKind.Resume, "dotnet://debugger-test.dll/debugger-test.cs", 1363, 8, "ReadOnlySpanTest.Run",
 locals_fn: async (locals) =>
 {
 await CheckValueType(locals, "var1", "System.ReadOnlySpan<object>", description: "System.ReadOnlySpan<Object>[0]");
 }
 );
 }
 }
}

17 changes: 17 additions & 0 deletions
src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1354,4 +1354,21 @@ public void CallMethod()
 }

 public int myField;
}
public class ReadOnlySpanTest
{
 public static void Run()
 {
 Invoke(new string[] {"TEST"});
 ReadOnlySpan<object> var1 = new ReadOnlySpan<object>();
 System.Diagnostics.Debugger.Break();
 }
 public static void Invoke(object[] parameters)
 {
 CheckArguments(parameters);
 }
 public static void CheckArguments(ReadOnlySpan<object> parameters)
 {
 System.Diagnostics.Debugger.Break();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono][debugger] fix exception while decoding value that has a byref field#75774

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

 Merged

thaystg
merged 2 commits into

from

Sep 26, 2022
 Merged


[mono][debugger] fix exception while decoding value that has a byref field
#75774
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
317f16f

fix exception while decoding value that has a byref field


thaystg Sep 16, 2022
7d06ea6

Apply suggestions from code review


thaystg Sep 23, 2022

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


11 changes: 10 additions & 1 deletion
src/mono/mono/component/debugger-agent.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5078,6 +5078,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 /* This can happen with compiler generated locals */
 //PRINT_MSG ("%s\n", mono_type_full_name (t));
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 return;
 }
 g_assert (*(void**)addr);
Expand DownExpand Up@@ -5231,6 +5233,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 } else {
 /* The client can't handle PARENT_VTYPE */
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 }
 break;
 } else {
Expand DownExpand Up@@ -5613,6 +5617,11 @@ decode_value (MonoType *t, MonoDomain *domain, gpointer void_addr, gpointer void
	ErrorCode err;
	int type = decode_byte (buf, &buf, limit);

	if (m_type_is_byref (t)) {
 *(guint8**)addr = (guint8 *)g_malloc (sizeof (void*)); //when the object will be deleted it will delete this memory allocated here together?
 addr = *(guint8**)addr;
	}

	if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type_internal (t))) {
 MonoType *targ = t->data.generic_class->context.class_inst->type_argv [0];
 guint8 *nullable_buf;
Expand DownExpand Up@@ -6082,7 +6091,7 @@ mono_do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, gu
 }
	} else {
 if (!(m->flags & METHOD_ATTRIBUTE_STATIC) || (m->flags & METHOD_ATTRIBUTE_STATIC && !CHECK_PROTOCOL_VERSION (2, 59))) { //on icordbg I couldn't find an object when invoking a static method maybe I can change this later
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 if (err != ERR_NONE)
 return err;
 }
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1608,6 +1608,14 @@ public async Task<string> GetValueFromDebuggerDisplayAttribute(DotnetObjectId do
 {
 dispAttrStr = dispAttrStr.Replace(",nq", "");
 }
 if (dispAttrStr.Contains(", raw"))
@lewinglewingSep 23, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe turn all these into a regex (and or use ordinal)
 {
 dispAttrStr = dispAttrStr.Replace(", raw", "");
 }
 if (dispAttrStr.Contains(",raw"))
 {
 dispAttrStr = dispAttrStr.Replace(",raw", "");
 }
 expr = "$\"" + dispAttrStr + "\"";
 JObject retValue = await resolver.Resolve(expr, token);
 retValue ??= await ExpressionEvaluator.CompileAndRunTheExpression(expr, resolver, logger, token);
Expand Down

25 changes: 25 additions & 0 deletions
src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,5 +1100,30 @@ await EvaluateAndCheck(
 bp.Value["locations"][0]["columnNumber"].Value<int>(),
 $"DebuggerTests.CheckChineseCharacterInPath.Evaluate");
 }

 [Fact]
 public async Task InspectReadOnlySpan()
 {
 var expression = $"{{ invoke_static_method('[debugger-test] ReadOnlySpanTest:Run'); }}";

 await EvaluateAndCheck(
 "window.setTimeout(function() {" + expression + "; }, 1);",
 "dotnet://debugger-test.dll/debugger-test.cs", 1371, 8,
 "ReadOnlySpanTest.CheckArguments",
 wait_for_event_fn: async (pause_location) =>
 {
 var id = pause_location["callFrames"][0]["callFrameId"].Value<string>();
 await EvaluateOnCallFrameAndCheck(id,
 ("parameters.ToString()", TString("System.ReadOnlySpan<Object>[1]"))
 );
 }
 );
 await StepAndCheck(StepKind.Resume, "dotnet://debugger-test.dll/debugger-test.cs", 1363, 8, "ReadOnlySpanTest.Run",
 locals_fn: async (locals) =>
 {
 await CheckValueType(locals, "var1", "System.ReadOnlySpan<object>", description: "System.ReadOnlySpan<Object>[0]");
 }
 );
 }
 }
}

17 changes: 17 additions & 0 deletions
src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1354,4 +1354,21 @@ public void CallMethod()
 }

 public int myField;
}
public class ReadOnlySpanTest
{
 public static void Run()
 {
 Invoke(new string[] {"TEST"});
 ReadOnlySpan<object> var1 = new ReadOnlySpan<object>();
 System.Diagnostics.Debugger.Break();
 }
 public static void Invoke(object[] parameters)
 {
 CheckArguments(parameters);
 }
 public static void CheckArguments(ReadOnlySpan<object> parameters)
 {
 System.Diagnostics.Debugger.Break();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[mono][debugger] fix exception while decoding value that has a byref field#75774

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

 Merged

thaystg
merged 2 commits into

from

Sep 26, 2022
 Merged


[mono][debugger] fix exception while decoding value that has a byref field
#75774
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
317f16f

fix exception while decoding value that has a byref field


thaystg Sep 16, 2022
7d06ea6

Apply suggestions from code review


thaystg Sep 23, 2022

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


11 changes: 10 additions & 1 deletion
src/mono/mono/component/debugger-agent.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5078,6 +5078,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 /* This can happen with compiler generated locals */
 //PRINT_MSG ("%s\n", mono_type_full_name (t));
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 return;
 }
 g_assert (*(void**)addr);
Expand DownExpand Up@@ -5231,6 +5233,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 } else {
 /* The client can't handle PARENT_VTYPE */
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 }
 break;
 } else {
Expand DownExpand Up@@ -5613,6 +5617,11 @@ decode_value (MonoType *t, MonoDomain *domain, gpointer void_addr, gpointer void
	ErrorCode err;
	int type = decode_byte (buf, &buf, limit);

	if (m_type_is_byref (t)) {
 *(guint8**)addr = (guint8 *)g_malloc (sizeof (void*)); //when the object will be deleted it will delete this memory allocated here together?
 addr = *(guint8**)addr;
	}

	if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type_internal (t))) {
 MonoType *targ = t->data.generic_class->context.class_inst->type_argv [0];
 guint8 *nullable_buf;
Expand DownExpand Up@@ -6082,7 +6091,7 @@ mono_do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, gu
 }
	} else {
 if (!(m->flags & METHOD_ATTRIBUTE_STATIC) || (m->flags & METHOD_ATTRIBUTE_STATIC && !CHECK_PROTOCOL_VERSION (2, 59))) { //on icordbg I couldn't find an object when invoking a static method maybe I can change this later
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 if (err != ERR_NONE)
 return err;
 }
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1608,6 +1608,14 @@ public async Task<string> GetValueFromDebuggerDisplayAttribute(DotnetObjectId do
 {
 dispAttrStr = dispAttrStr.Replace(",nq", "");
 }
 if (dispAttrStr.Contains(", raw"))
@lewinglewingSep 23, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe turn all these into a regex (and or use ordinal)
 {
 dispAttrStr = dispAttrStr.Replace(", raw", "");
 }
 if (dispAttrStr.Contains(",raw"))
 {
 dispAttrStr = dispAttrStr.Replace(",raw", "");
 }
 expr = "$\"" + dispAttrStr + "\"";
 JObject retValue = await resolver.Resolve(expr, token);
 retValue ??= await ExpressionEvaluator.CompileAndRunTheExpression(expr, resolver, logger, token);
Expand Down

25 changes: 25 additions & 0 deletions
src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,5 +1100,30 @@ await EvaluateAndCheck(
 bp.Value["locations"][0]["columnNumber"].Value<int>(),
 $"DebuggerTests.CheckChineseCharacterInPath.Evaluate");
 }

 [Fact]
 public async Task InspectReadOnlySpan()
 {
 var expression = $"{{ invoke_static_method('[debugger-test] ReadOnlySpanTest:Run'); }}";

 await EvaluateAndCheck(
 "window.setTimeout(function() {" + expression + "; }, 1);",
 "dotnet://debugger-test.dll/debugger-test.cs", 1371, 8,
 "ReadOnlySpanTest.CheckArguments",
 wait_for_event_fn: async (pause_location) =>
 {
 var id = pause_location["callFrames"][0]["callFrameId"].Value<string>();
 await EvaluateOnCallFrameAndCheck(id,
 ("parameters.ToString()", TString("System.ReadOnlySpan<Object>[1]"))
 );
 }
 );
 await StepAndCheck(StepKind.Resume, "dotnet://debugger-test.dll/debugger-test.cs", 1363, 8, "ReadOnlySpanTest.Run",
 locals_fn: async (locals) =>
 {
 await CheckValueType(locals, "var1", "System.ReadOnlySpan<object>", description: "System.ReadOnlySpan<Object>[0]");
 }
 );
 }
 }
}

17 changes: 17 additions & 0 deletions
src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1354,4 +1354,21 @@ public void CallMethod()
 }

 public int myField;
}
public class ReadOnlySpanTest
{
 public static void Run()
 {
 Invoke(new string[] {"TEST"});
 ReadOnlySpan<object> var1 = new ReadOnlySpan<object>();
 System.Diagnostics.Debugger.Break();
 }
 public static void Invoke(object[] parameters)
 {
 CheckArguments(parameters);
 }
 public static void CheckArguments(ReadOnlySpan<object> parameters)
 {
 System.Diagnostics.Debugger.Break();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono][debugger] fix exception while decoding value that has a byref field#75774

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

 Merged

thaystg
merged 2 commits into

from

Sep 26, 2022
 Merged


[mono][debugger] fix exception while decoding value that has a byref field
#75774
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
317f16f

fix exception while decoding value that has a byref field


thaystg Sep 16, 2022
7d06ea6

Apply suggestions from code review


thaystg Sep 23, 2022

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


11 changes: 10 additions & 1 deletion
src/mono/mono/component/debugger-agent.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5078,6 +5078,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 /* This can happen with compiler generated locals */
 //PRINT_MSG ("%s\n", mono_type_full_name (t));
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 return;
 }
 g_assert (*(void**)addr);
Expand DownExpand Up@@ -5231,6 +5233,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 } else {
 /* The client can't handle PARENT_VTYPE */
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 }
 break;
 } else {
Expand DownExpand Up@@ -5613,6 +5617,11 @@ decode_value (MonoType *t, MonoDomain *domain, gpointer void_addr, gpointer void
	ErrorCode err;
	int type = decode_byte (buf, &buf, limit);

	if (m_type_is_byref (t)) {
 *(guint8**)addr = (guint8 *)g_malloc (sizeof (void*)); //when the object will be deleted it will delete this memory allocated here together?
 addr = *(guint8**)addr;
	}

	if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type_internal (t))) {
 MonoType *targ = t->data.generic_class->context.class_inst->type_argv [0];
 guint8 *nullable_buf;
Expand DownExpand Up@@ -6082,7 +6091,7 @@ mono_do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, gu
 }
	} else {
 if (!(m->flags & METHOD_ATTRIBUTE_STATIC) || (m->flags & METHOD_ATTRIBUTE_STATIC && !CHECK_PROTOCOL_VERSION (2, 59))) { //on icordbg I couldn't find an object when invoking a static method maybe I can change this later
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 if (err != ERR_NONE)
 return err;
 }
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1608,6 +1608,14 @@ public async Task<string> GetValueFromDebuggerDisplayAttribute(DotnetObjectId do
 {
 dispAttrStr = dispAttrStr.Replace(",nq", "");
 }
 if (dispAttrStr.Contains(", raw"))
@lewinglewingSep 23, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe turn all these into a regex (and or use ordinal)
 {
 dispAttrStr = dispAttrStr.Replace(", raw", "");
 }
 if (dispAttrStr.Contains(",raw"))
 {
 dispAttrStr = dispAttrStr.Replace(",raw", "");
 }
 expr = "$\"" + dispAttrStr + "\"";
 JObject retValue = await resolver.Resolve(expr, token);
 retValue ??= await ExpressionEvaluator.CompileAndRunTheExpression(expr, resolver, logger, token);
Expand Down

25 changes: 25 additions & 0 deletions
src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,5 +1100,30 @@ await EvaluateAndCheck(
 bp.Value["locations"][0]["columnNumber"].Value<int>(),
 $"DebuggerTests.CheckChineseCharacterInPath.Evaluate");
 }

 [Fact]
 public async Task InspectReadOnlySpan()
 {
 var expression = $"{{ invoke_static_method('[debugger-test] ReadOnlySpanTest:Run'); }}";

 await EvaluateAndCheck(
 "window.setTimeout(function() {" + expression + "; }, 1);",
 "dotnet://debugger-test.dll/debugger-test.cs", 1371, 8,
 "ReadOnlySpanTest.CheckArguments",
 wait_for_event_fn: async (pause_location) =>
 {
 var id = pause_location["callFrames"][0]["callFrameId"].Value<string>();
 await EvaluateOnCallFrameAndCheck(id,
 ("parameters.ToString()", TString("System.ReadOnlySpan<Object>[1]"))
 );
 }
 );
 await StepAndCheck(StepKind.Resume, "dotnet://debugger-test.dll/debugger-test.cs", 1363, 8, "ReadOnlySpanTest.Run",
 locals_fn: async (locals) =>
 {
 await CheckValueType(locals, "var1", "System.ReadOnlySpan<object>", description: "System.ReadOnlySpan<Object>[0]");
 }
 );
 }
 }
}

17 changes: 17 additions & 0 deletions
src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1354,4 +1354,21 @@ public void CallMethod()
 }

 public int myField;
}
public class ReadOnlySpanTest
{
 public static void Run()
 {
 Invoke(new string[] {"TEST"});
 ReadOnlySpan<object> var1 = new ReadOnlySpan<object>();
 System.Diagnostics.Debugger.Break();
 }
 public static void Invoke(object[] parameters)
 {
 CheckArguments(parameters);
 }
 public static void CheckArguments(ReadOnlySpan<object> parameters)
 {
 System.Diagnostics.Debugger.Break();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono][debugger] fix exception while decoding value that has a byref field#75774

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

 Merged

thaystg
merged 2 commits into

from

Sep 26, 2022
 Merged


[mono][debugger] fix exception while decoding value that has a byref field
#75774
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
317f16f

fix exception while decoding value that has a byref field


thaystg Sep 16, 2022
7d06ea6

Apply suggestions from code review


thaystg Sep 23, 2022

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


11 changes: 10 additions & 1 deletion
src/mono/mono/component/debugger-agent.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5078,6 +5078,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 /* This can happen with compiler generated locals */
 //PRINT_MSG ("%s\n", mono_type_full_name (t));
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 return;
 }
 g_assert (*(void**)addr);
Expand DownExpand Up@@ -5231,6 +5233,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 } else {
 /* The client can't handle PARENT_VTYPE */
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 }
 break;
 } else {
Expand DownExpand Up@@ -5613,6 +5617,11 @@ decode_value (MonoType *t, MonoDomain *domain, gpointer void_addr, gpointer void
	ErrorCode err;
	int type = decode_byte (buf, &buf, limit);

	if (m_type_is_byref (t)) {
 *(guint8**)addr = (guint8 *)g_malloc (sizeof (void*)); //when the object will be deleted it will delete this memory allocated here together?
 addr = *(guint8**)addr;
	}

	if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type_internal (t))) {
 MonoType *targ = t->data.generic_class->context.class_inst->type_argv [0];
 guint8 *nullable_buf;
Expand DownExpand Up@@ -6082,7 +6091,7 @@ mono_do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, gu
 }
	} else {
 if (!(m->flags & METHOD_ATTRIBUTE_STATIC) || (m->flags & METHOD_ATTRIBUTE_STATIC && !CHECK_PROTOCOL_VERSION (2, 59))) { //on icordbg I couldn't find an object when invoking a static method maybe I can change this later
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 if (err != ERR_NONE)
 return err;
 }
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1608,6 +1608,14 @@ public async Task<string> GetValueFromDebuggerDisplayAttribute(DotnetObjectId do
 {
 dispAttrStr = dispAttrStr.Replace(",nq", "");
 }
 if (dispAttrStr.Contains(", raw"))
@lewinglewingSep 23, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe turn all these into a regex (and or use ordinal)
 {
 dispAttrStr = dispAttrStr.Replace(", raw", "");
 }
 if (dispAttrStr.Contains(",raw"))
 {
 dispAttrStr = dispAttrStr.Replace(",raw", "");
 }
 expr = "$\"" + dispAttrStr + "\"";
 JObject retValue = await resolver.Resolve(expr, token);
 retValue ??= await ExpressionEvaluator.CompileAndRunTheExpression(expr, resolver, logger, token);
Expand Down

25 changes: 25 additions & 0 deletions
src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,5 +1100,30 @@ await EvaluateAndCheck(
 bp.Value["locations"][0]["columnNumber"].Value<int>(),
 $"DebuggerTests.CheckChineseCharacterInPath.Evaluate");
 }

 [Fact]
 public async Task InspectReadOnlySpan()
 {
 var expression = $"{{ invoke_static_method('[debugger-test] ReadOnlySpanTest:Run'); }}";

 await EvaluateAndCheck(
 "window.setTimeout(function() {" + expression + "; }, 1);",
 "dotnet://debugger-test.dll/debugger-test.cs", 1371, 8,
 "ReadOnlySpanTest.CheckArguments",
 wait_for_event_fn: async (pause_location) =>
 {
 var id = pause_location["callFrames"][0]["callFrameId"].Value<string>();
 await EvaluateOnCallFrameAndCheck(id,
 ("parameters.ToString()", TString("System.ReadOnlySpan<Object>[1]"))
 );
 }
 );
 await StepAndCheck(StepKind.Resume, "dotnet://debugger-test.dll/debugger-test.cs", 1363, 8, "ReadOnlySpanTest.Run",
 locals_fn: async (locals) =>
 {
 await CheckValueType(locals, "var1", "System.ReadOnlySpan<object>", description: "System.ReadOnlySpan<Object>[0]");
 }
 );
 }
 }
}

17 changes: 17 additions & 0 deletions
src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1354,4 +1354,21 @@ public void CallMethod()
 }

 public int myField;
}
public class ReadOnlySpanTest
{
 public static void Run()
 {
 Invoke(new string[] {"TEST"});
 ReadOnlySpan<object> var1 = new ReadOnlySpan<object>();
 System.Diagnostics.Debugger.Break();
 }
 public static void Invoke(object[] parameters)
 {
 CheckArguments(parameters);
 }
 public static void CheckArguments(ReadOnlySpan<object> parameters)
 {
 System.Diagnostics.Debugger.Break();
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[mono][debugger] fix exception while decoding value that has a byref field#75774

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

 Merged

thaystg
merged 2 commits into

from

Sep 26, 2022
 Merged


[mono][debugger] fix exception while decoding value that has a byref field
#75774
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
317f16f

fix exception while decoding value that has a byref field


thaystg Sep 16, 2022
7d06ea6

Apply suggestions from code review


thaystg Sep 23, 2022

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


11 changes: 10 additions & 1 deletion
src/mono/mono/component/debugger-agent.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5078,6 +5078,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 /* This can happen with compiler generated locals */
 //PRINT_MSG ("%s\n", mono_type_full_name (t));
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 return;
 }
 g_assert (*(void**)addr);
Expand DownExpand Up@@ -5231,6 +5233,8 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain,
 } else {
 /* The client can't handle PARENT_VTYPE */
 buffer_add_byte (buf, VALUE_TYPE_ID_NULL);
 if (CHECK_PROTOCOL_VERSION (2, 59))
 buffer_add_info_for_null_value (buf, t, domain);
 }
 break;
 } else {
Expand DownExpand Up@@ -5613,6 +5617,11 @@ decode_value (MonoType *t, MonoDomain *domain, gpointer void_addr, gpointer void
	ErrorCode err;
	int type = decode_byte (buf, &buf, limit);

	if (m_type_is_byref (t)) {
 *(guint8**)addr = (guint8 *)g_malloc (sizeof (void*)); //when the object will be deleted it will delete this memory allocated here together?
 addr = *(guint8**)addr;
	}

	if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type_internal (t))) {
 MonoType *targ = t->data.generic_class->context.class_inst->type_argv [0];
 guint8 *nullable_buf;
Expand DownExpand Up@@ -6082,7 +6091,7 @@ mono_do_invoke_method (DebuggerTlsData *tls, Buffer *buf, InvokeData *invoke, gu
 }
	} else {
 if (!(m->flags & METHOD_ATTRIBUTE_STATIC) || (m->flags & METHOD_ATTRIBUTE_STATIC && !CHECK_PROTOCOL_VERSION (2, 59))) { //on icordbg I couldn't find an object when invoking a static method maybe I can change this later
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 err = decode_value(m_class_get_byval_arg(m->klass), domain, this_buf, p, &p, end, FALSE);
 if (err != ERR_NONE)
 return err;
 }
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1608,6 +1608,14 @@ public async Task<string> GetValueFromDebuggerDisplayAttribute(DotnetObjectId do
 {
 dispAttrStr = dispAttrStr.Replace(",nq", "");
 }
 if (dispAttrStr.Contains(", raw"))
@lewinglewingSep 23, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe turn all these into a regex (and or use ordinal)
 {
 dispAttrStr = dispAttrStr.Replace(", raw", "");
 }
 if (dispAttrStr.Contains(",raw"))
 {
 dispAttrStr = dispAttrStr.Replace(",raw", "");
 }
 expr = "$\"" + dispAttrStr + "\"";
 JObject retValue = await resolver.Resolve(expr, token);
 retValue ??= await ExpressionEvaluator.CompileAndRunTheExpression(expr, resolver, logger, token);
Expand Down

25 changes: 25 additions & 0 deletions
src/mono/wasm/debugger/DebuggerTestSuite/MiscTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1100,5 +1100,30 @@ await EvaluateAndCheck(
 bp.Value["locations"][0]["columnNumber"].Value<int>(),
 $"DebuggerTests.CheckChineseCharacterInPath.Evaluate");
 }

 [Fact]
 public async Task InspectReadOnlySpan()
 {
 var expression = $"{{ invoke_static_method('[debugger-test] ReadOnlySpanTest:Run'); }}";

 await EvaluateAndCheck(
 "window.setTimeout(function() {" + expression + "; }, 1);",
 "dotnet://debugger-test.dll/debugger-test.cs", 1371, 8,
 "ReadOnlySpanTest.CheckArguments",
 wait_for_event_fn: async (pause_location) =>
 {
 var id = pause_location["callFrames"][0]["callFrameId"].Value<string>();
 await EvaluateOnCallFrameAndCheck(id,
 ("parameters.ToString()", TString("System.ReadOnlySpan<Object>[1]"))
 );
 }
 );
 await StepAndCheck(StepKind.Resume, "dotnet://debugger-test.dll/debugger-test.cs", 1363, 8, "ReadOnlySpanTest.Run",
 locals_fn: async (locals) =>
 {
 await CheckValueType(locals, "var1", "System.ReadOnlySpan<object>", description: "System.ReadOnlySpan<Object>[0]");
 }
 );
 }
 }
}

17 changes: 17 additions & 0 deletions
src/mono/wasm/debugger/tests/debugger-test/debugger-test.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1354,4 +1354,21 @@ public void CallMethod()
 }

 public int myField;
}
public class ReadOnlySpanTest
{
 public static void Run()
 {
 Invoke(new string[] {"TEST"});
 ReadOnlySpan<object> var1 = new ReadOnlySpan<object>();
 System.Diagnostics.Debugger.Break();
 }
 public static void Invoke(object[] parameters)
 {
 CheckArguments(parameters);
 }
 public static void CheckArguments(ReadOnlySpan<object> parameters)
 {
 System.Diagnostics.Debugger.Break();
 }
}