Skip to content

[mono] Fix CMD_OBJECT_REF_GET_VALUES_BY_FIELD_TOKEN behavior #93363

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 1 commit into from
Oct 16, 2023
Merged

[mono] Fix CMD_OBJECT_REF_GET_VALUES_BY_FIELD_TOKEN behavior #93363

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions src/mono/mono/component/debugger-agent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10315,13 +10315,21 @@ object_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
case CMD_OBJECT_REF_GET_VALUES_BY_FIELD_TOKEN: {
len = 1;
i = 0;
MonoClass* klass = decode_typeid (p, &p, end, NULL, &err);
int class_token = decode_int (p, &p, end);
int field_token = decode_int (p, &p, end);
gpointer iter = NULL;

while ((f = mono_class_get_fields_internal (klass, &iter))) {
if (mono_class_get_field_token (f) == field_token)
for (k = obj_type; k; k = m_class_get_parent (k)) {
if (m_class_get_type_token (k) == class_token) {
break;
}
}
if (!k)
goto invalid_fieldid;
while ((f = mono_class_get_fields_internal (k, &iter))) {
if (mono_class_get_field_token (f) == field_token) {
goto get_field_value;
}
}
goto invalid_fieldid;
}
Expand Down