From 7190276c52b9d86a52aae73d3a0f8b56e7a1f4f1 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 12 Dec 2019 14:54:47 -0500 Subject: [PATCH] Replace xmalloc/xfree with vector in jit.c I'm currently studying that code and noticed this manual memory management, which could easily be replaced with a vector, so here it is. gdb/ChangeLog: * jit.c (jit_reader_try_read_symtab): Replace xmalloc/xfree with gdb::byte_vector. --- gdb/ChangeLog | 5 +++++ gdb/jit.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2ffc3334fe..165ffda251 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-12-12 Simon Marchi + + * jit.c (jit_reader_try_read_symtab): Replace xmalloc/xfree with + gdb::byte_vector. + 2019-12-12 Tom Tromey * xml-support.c (xml_fetch_content_from_file): Don't call diff --git a/gdb/jit.c b/gdb/jit.c index 480b4596ac..b6e51e4f8b 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -808,7 +808,6 @@ static int jit_reader_try_read_symtab (struct jit_code_entry *code_entry, CORE_ADDR entry_addr) { - gdb_byte *gdb_mem; int status; jit_dbg_reader_data priv_data; struct gdb_reader_funcs *funcs; @@ -831,12 +830,12 @@ jit_reader_try_read_symtab (struct jit_code_entry *code_entry, if (!loaded_jit_reader) return 0; - gdb_mem = (gdb_byte *) xmalloc (code_entry->symfile_size); + gdb::byte_vector gdb_mem (code_entry->symfile_size); status = 1; try { - if (target_read_memory (code_entry->symfile_addr, gdb_mem, + if (target_read_memory (code_entry->symfile_addr, gdb_mem.data (), code_entry->symfile_size)) status = 0; } @@ -848,12 +847,12 @@ jit_reader_try_read_symtab (struct jit_code_entry *code_entry, if (status) { funcs = loaded_jit_reader->functions; - if (funcs->read (funcs, &callbacks, gdb_mem, code_entry->symfile_size) + if (funcs->read (funcs, &callbacks, gdb_mem.data (), + code_entry->symfile_size) != GDB_SUCCESS) status = 0; } - xfree (gdb_mem); if (jit_debug && status == 0) fprintf_unfiltered (gdb_stdlog, "Could not read symtab using the loaded JIT reader.\n"); -- 2.34.1