From c6778d00df0fbc7fe53801717eb934a5d7b9674a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 14 Aug 2019 09:11:28 -0600 Subject: [PATCH] Simplify write_inferior_memory gdbserver's write_inferior_memory uses a static variable to avoid memory leaks, and has a comment referring to the lack of cleanups. This patch removes this comment and the code in favor of a straightforward use of std::vector. gdb/gdbserver/ChangeLog 2019-08-15 Tom Tromey * target.c (write_inferior_memory): Use std::vector. --- gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/target.c | 22 +++++----------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 2dda3521ec9..e4ad220a6aa 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2019-08-15 Tom Tromey + + * target.c (write_inferior_memory): Use std::vector. + 2019-08-06 Frank Ch. Eigler PR build/24886 diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c index 25f91eeba73..2587d8aa550 100644 --- a/gdb/gdbserver/target.c +++ b/gdb/gdbserver/target.c @@ -150,23 +150,11 @@ int write_inferior_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) { - /* Lacking cleanups, there is some potential for a memory leak if the - write fails and we go through error(). Make sure that no more than - one buffer is ever pending by making BUFFER static. */ - static unsigned char *buffer = 0; - int res; - - if (buffer != NULL) - free (buffer); - - buffer = (unsigned char *) xmalloc (len); - memcpy (buffer, myaddr, len); - check_mem_write (memaddr, buffer, myaddr, len); - res = (*the_target->write_memory) (memaddr, buffer, len); - free (buffer); - buffer = NULL; - - return res; + /* Make a copy of the data because check_mem_write may need to + update it. */ + std::vector buffer (myaddr, myaddr + len); + check_mem_write (memaddr, buffer.data (), myaddr, len); + return (*the_target->write_memory) (memaddr, buffer.data (), len); } /* See target/target.h. */ -- 2.30.2