[merp] Fix image size reported (mono/mono#13847)

* [merp] Point managed image_size at correct size field

* [merp] Bump merp version number

Fixes mono/mono#13834

Commit migrated from https://github.com/mono/mono/commit/5f5c51f3ef40a91053b38cc4ef9673098bab2fe9

diff --git a/src/mono/mono/mini/mini-exceptions.c b/src/mono/mono/mini/mini-exceptions.c
index 783bf19..daef57c 100644 (file)
--- a/src/mono/mono/mini/mini-exceptions.c
+++ b/src/mono/mono/mini/mini-exceptions.c
@@ -1585,7 +1585,7 @@ summarize_frame_internal (MonoMethod *method, gpointer ip, size_t native_offset,
                dest->managed_data.filename = image->module_name;
 
                MonoDotNetHeader *header = &image->image_info->cli_header;
-               dest->managed_data.image_size = header->pe.pe_code_size;
+               dest->managed_data.image_size = header->nt.pe_image_size;
 
                dest->managed_data.time_date_stamp = image->time_date_stamp;
 

diff --git a/src/mono/mono/utils/mono-state.h b/src/mono/mono/utils/mono-state.h
index 0b3c07e..4f8abdd 100644 (file)
--- a/src/mono/mono/utils/mono-state.h
+++ b/src/mono/mono/utils/mono-state.h
@@ -18,7 +18,7 @@
 #include <mono/metadata/threads-types.h>
 #include <mono/utils/json.h>
 
-#define MONO_NATIVE_STATE_PROTOCOL_VERSION "0.0.3"
+#define MONO_NATIVE_STATE_PROTOCOL_VERSION "0.0.4"
 
 typedef enum {
        MonoSummaryNone,