diff options
| author | Pierre Muller <muller@sourceware.org> | 2012-12-14 07:50:02 +0000 |
|---|---|---|
| committer | Pierre Muller <muller@sourceware.org> | 2012-12-14 07:50:02 +0000 |
| commit | 49dc7f4b4736a708e8de645ebff64ba5084d33d1 (patch) | |
| tree | 9d7e2f22406d15e8332e756284657084029938ab | |
| parent | 62ea864c39e8c34d5d92e9daf94aebe088fa03e9 (diff) | |
| download | gdb-49dc7f4b4736a708e8de645ebff64ba5084d33d1.zip gdb-49dc7f4b4736a708e8de645ebff64ba5084d33d1.tar.gz gdb-49dc7f4b4736a708e8de645ebff64ba5084d33d1.tar.bz2 | |
* windows-nat.c (windows_xfer_shared_libraries): Avoid
memory leak when OFFSET >= LEN_AVAIL.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/windows-nat.c | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 891f6e0..d3c886d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-12-14 Pierre Muller <muller@sourceware.org> + + * windows-nat.c (windows_xfer_shared_libraries): Avoid + memory leak when OFFSET >= LEN_AVAIL. + 2012-12-13 Tom Tromey <tromey@redhat.com> * solib-svr4.c (enable_break): Use SECT_OFF_TEXT. diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 75831d8..cc81a66 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2411,11 +2411,13 @@ windows_xfer_shared_libraries (struct target_ops *ops, buf = obstack_finish (&obstack); len_avail = strlen (buf); if (offset >= len_avail) - return 0; - - if (len > len_avail - offset) - len = len_avail - offset; - memcpy (readbuf, buf + offset, len); + len= 0; + else + { + if (len > len_avail - offset) + len = len_avail - offset; + memcpy (readbuf, buf + offset, len); + } obstack_free (&obstack, NULL); return len; |