From 65bc4a838ff07c455eac8c37691a01eb4394de7f Mon Sep 17 00:00:00 2001 From: John Salem Date: Thu, 21 Oct 2021 18:26:36 +0000 Subject: [PATCH 1/2] Properly use result value for dump IPC cmd --- src/native/eventpipe/ds-dump-protocol.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/native/eventpipe/ds-dump-protocol.c b/src/native/eventpipe/ds-dump-protocol.c index 4e247c3aa0e1c9..017491b2bc4e61 100644 --- a/src/native/eventpipe/ds-dump-protocol.c +++ b/src/native/eventpipe/ds-dump-protocol.c @@ -105,7 +105,7 @@ dump_protocol_helper_generate_core_dump ( if (!stream) return false; - bool result = false; + ds_ipc_result_t ipc_result = DS_IPC_E_FAIL; DiagnosticsGenerateCoreDumpCommandPayload *payload; payload = (DiagnosticsGenerateCoreDumpCommandPayload *)ds_ipc_message_try_parse_payload (message, generate_core_dump_command_try_parse_payload); @@ -114,13 +114,12 @@ dump_protocol_helper_generate_core_dump ( ep_raise_error (); } - ds_ipc_result_t ipc_result; ipc_result = ds_rt_generate_core_dump (payload); - if (result != DS_IPC_S_OK) { - ds_ipc_message_send_error (stream, result); + if (ipc_result != DS_IPC_S_OK) { + ds_ipc_message_send_error (stream, ipc_result); ep_raise_error (); } else { - ds_ipc_message_send_success (stream, result); + ds_ipc_message_send_success (stream, ipc_result); } result = true; @@ -128,10 +127,10 @@ dump_protocol_helper_generate_core_dump ( ep_on_exit: ds_generate_core_dump_command_payload_free (payload); ds_ipc_stream_free (stream); - return result; + return ipc_result == DS_IPC_S_OK; ep_on_error: - EP_ASSERT (!result); + EP_ASSERT (ipc_result != DS_IPC_S_OK); ep_exit_error_handler (); } From e2c0fbecedba8d1d0e52b24d3c06da496090e7ff Mon Sep 17 00:00:00 2001 From: John Salem Date: Thu, 21 Oct 2021 18:53:56 +0000 Subject: [PATCH 2/2] Fix typo --- src/native/eventpipe/ds-dump-protocol.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/native/eventpipe/ds-dump-protocol.c b/src/native/eventpipe/ds-dump-protocol.c index 017491b2bc4e61..484c01e53ff097 100644 --- a/src/native/eventpipe/ds-dump-protocol.c +++ b/src/native/eventpipe/ds-dump-protocol.c @@ -122,8 +122,6 @@ dump_protocol_helper_generate_core_dump ( ds_ipc_message_send_success (stream, ipc_result); } - result = true; - ep_on_exit: ds_generate_core_dump_command_payload_free (payload); ds_ipc_stream_free (stream);