Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fix CMD_OBJECT_REF_GET_VALUES_BY_FIELD_TOKEN behavior (#93363)
  • Loading branch information
thaystg committed Jan 18, 2024
commit 77a3613dd1bb386fb53082a46bbd1babd7e5670e
14 changes: 11 additions & 3 deletions src/mono/mono/component/debugger-agent.c
Original file line number Diff line number Diff line change
Expand Up @@ -10385,13 +10385,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