projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2687 from lambdageek/dev/monoerror-mono_param_get_objects_internal
[mono.git]
/
mono
/
mini
/
debugger-agent.c
diff --git
a/mono/mini/debugger-agent.c
b/mono/mini/debugger-agent.c
index 65c381bfad082d1e8fa08671d0fbef0fb5a0c4c8..140fbfb689b1f89ea0ef61570ed56b0c51bf9c01 100644
(file)
--- a/
mono/mini/debugger-agent.c
+++ b/
mono/mini/debugger-agent.c
@@
-8375,6
+8375,7
@@
method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
break;
}
case CMD_METHOD_GET_DEBUG_INFO: {
break;
}
case CMD_METHOD_GET_DEBUG_INFO: {
+ MonoError error;
MonoDebugMethodInfo *minfo;
char *source_file;
int i, j, n_il_offsets;
MonoDebugMethodInfo *minfo;
char *source_file;
int i, j, n_il_offsets;
@@
-8382,8
+8383,9
@@
method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
GPtrArray *source_file_list;
MonoSymSeqPoint *sym_seq_points;
GPtrArray *source_file_list;
MonoSymSeqPoint *sym_seq_points;
- header = mono_method_get_header
(method
);
+ header = mono_method_get_header
_checked (method, &error
);
if (!header) {
if (!header) {
+ mono_error_cleanup (&error); /* FIXME don't swallow the error */
buffer_add_int (buf, 0);
buffer_add_string (buf, "");
buffer_add_int (buf, 0);
buffer_add_int (buf, 0);
buffer_add_string (buf, "");
buffer_add_int (buf, 0);
@@
-8470,13
+8472,16
@@
method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
break;
}
case CMD_METHOD_GET_LOCALS_INFO: {
break;
}
case CMD_METHOD_GET_LOCALS_INFO: {
+ MonoError error;
int i, num_locals;
MonoDebugLocalsInfo *locals;
int *locals_map = NULL;
int i, num_locals;
MonoDebugLocalsInfo *locals;
int *locals_map = NULL;
- header = mono_method_get_header (method);
- if (!header)
+ header = mono_method_get_header_checked (method, &error);
+ if (!header) {
+ mono_error_cleanup (&error); /* FIXME don't swallow the error */
return ERR_INVALID_ARGUMENT;
return ERR_INVALID_ARGUMENT;
+ }
locals = mono_debug_lookup_locals (method);
if (!locals) {
locals = mono_debug_lookup_locals (method);
if (!locals) {
@@
-8597,10
+8602,12
@@
method_commands_internal (int command, MonoMethod *method, MonoDomain *domain, g
}
break;
case CMD_METHOD_GET_BODY: {
}
break;
case CMD_METHOD_GET_BODY: {
+ MonoError error;
int i;
int i;
- header = mono_method_get_header
(method
);
+ header = mono_method_get_header
_checked (method, &error
);
if (!header) {
if (!header) {
+ mono_error_cleanup (&error); /* FIXME don't swallow the error */
buffer_add_int (buf, 0);
if (CHECK_PROTOCOL_VERSION (2, 18))
buffer_add_int (buf, 0);
if (CHECK_PROTOCOL_VERSION (2, 18))
@@
-8999,8
+9006,10
@@
frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
switch (command) {
case CMD_STACK_FRAME_GET_VALUES: {
switch (command) {
case CMD_STACK_FRAME_GET_VALUES: {
+ MonoError error;
len = decode_int (p, &p, end);
len = decode_int (p, &p, end);
- header = mono_method_get_header (frame->actual_method);
+ header = mono_method_get_header_checked (frame->actual_method, &error);
+ mono_error_assert_ok (&error); /* FIXME report error */
for (i = 0; i < len; ++i) {
pos = decode_int (p, &p, end);
for (i = 0; i < len; ++i) {
pos = decode_int (p, &p, end);
@@
-9051,12
+9060,14
@@
frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
break;
}
case CMD_STACK_FRAME_SET_VALUES: {
break;
}
case CMD_STACK_FRAME_SET_VALUES: {
+ MonoError error;
guint8 *val_buf;
MonoType *t;
MonoDebugVarInfo *var;
len = decode_int (p, &p, end);
guint8 *val_buf;
MonoType *t;
MonoDebugVarInfo *var;
len = decode_int (p, &p, end);
- header = mono_method_get_header (frame->actual_method);
+ header = mono_method_get_header_checked (frame->actual_method, &error);
+ mono_error_assert_ok (&error); /* FIXME report error */
for (i = 0; i < len; ++i) {
pos = decode_int (p, &p, end);
for (i = 0; i < len; ++i) {
pos = decode_int (p, &p, end);