From 4ebb95942abd975c7ef5eeebbeda6e30aac341b4 Mon Sep 17 00:00:00 2001 From: Andrew Au Date: Tue, 30 Jan 2024 10:03:36 -0800 Subject: [PATCH] Fix issue #713 --- .../src/dwarf/Gget_proc_info_in_range.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/native/external/libunwind/src/dwarf/Gget_proc_info_in_range.c b/src/native/external/libunwind/src/dwarf/Gget_proc_info_in_range.c index 5701c5d2d4ddf..216495af2d0ee 100644 --- a/src/native/external/libunwind/src/dwarf/Gget_proc_info_in_range.c +++ b/src/native/external/libunwind/src/dwarf/Gget_proc_info_in_range.c @@ -58,13 +58,13 @@ unw_get_proc_info_in_range (unw_word_t start_ip, if (eh_frame_table != 0) { unw_accessors_t *a = unw_get_accessors_int (as); - struct dwarf_eh_frame_hdr* exhdr = NULL; + struct dwarf_eh_frame_hdr exhdr; if ((*a->access_mem)(as, eh_frame_table, (unw_word_t*)&exhdr, 0, arg) < 0) { return -UNW_EINVAL; } - if (exhdr->version != DW_EH_VERSION) { - Debug (1, "Unexpected version %d\n", exhdr->version); + if (exhdr.version != DW_EH_VERSION) { + Debug (1, "Unexpected version %d\n", exhdr.version); return -UNW_EBADVERSION; } unw_word_t addr = eh_frame_table + offsetof(struct dwarf_eh_frame_hdr, eh_frame); @@ -72,12 +72,12 @@ unw_get_proc_info_in_range (unw_word_t start_ip, unw_word_t fde_count; /* read eh_frame_ptr */ - if ((ret = dwarf_read_encoded_pointer(as, a, &addr, exhdr->eh_frame_ptr_enc, pi, &eh_frame_start, arg)) < 0) { + if ((ret = dwarf_read_encoded_pointer(as, a, &addr, exhdr.eh_frame_ptr_enc, pi, &eh_frame_start, arg)) < 0) { return ret; } /* read fde_count */ - if ((ret = dwarf_read_encoded_pointer(as, a, &addr, exhdr->fde_count_enc, pi, &fde_count, arg)) < 0) { + if ((ret = dwarf_read_encoded_pointer(as, a, &addr, exhdr.fde_count_enc, pi, &fde_count, arg)) < 0) { return ret; } @@ -87,8 +87,8 @@ unw_get_proc_info_in_range (unw_word_t start_ip, return -UNW_ENOINFO; } - if (exhdr->table_enc != (DW_EH_PE_datarel | DW_EH_PE_sdata4)) { - Debug (1, "Table encoding not supported %x\n", exhdr->table_enc); + if (exhdr.table_enc != (DW_EH_PE_datarel | DW_EH_PE_sdata4)) { + Debug (1, "Table encoding not supported %x\n", exhdr.table_enc); return -UNW_EINVAL; } @@ -112,4 +112,4 @@ unw_get_proc_info_in_range (unw_word_t start_ip, return -UNW_ENOINFO; } return UNW_ESUCCESS; -} +} \ No newline at end of file