diff options
| author | Tom Tromey <tom@tromey.com> | 2017-08-19 22:15:30 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-08-22 09:38:06 -0600 |
| commit | 36bd8eaaa0afe3ff8e8b1b1b9edc9686f5c159e6 (patch) | |
| tree | 86d1fc6b419819bf97b6685326ac37f1494a80db /gdb | |
| parent | 56f37645249752378520a1c2430225c9cee09161 (diff) | |
| download | gdb-36bd8eaaa0afe3ff8e8b1b1b9edc9686f5c159e6.zip gdb-36bd8eaaa0afe3ff8e8b1b1b9edc9686f5c159e6.tar.gz gdb-36bd8eaaa0afe3ff8e8b1b1b9edc9686f5c159e6.tar.bz2 | |
Fix erroneous cleanup use in add_solib_catchpoint
I happened to notice that add_solib_catchpoint allocated the new
catchpoint with "new" but installed a cleanup using "xfree". This
patch fixes the bug by changing the function to use std::unique_ptr
instead.
ChangeLog
2017-08-22 Tom Tromey <tom@tromey.com>
* breakpoint.c (add_solib_catchpoint): Use std::unique_ptr.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e291719..1cd0eaa 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2017-08-22 Tom Tromey <tom@tromey.com> + * breakpoint.c (add_solib_catchpoint): Use std::unique_ptr. + +2017-08-22 Tom Tromey <tom@tromey.com> + * psymtab.c (psymtab_search_name): Return a unique_xmalloc_ptr. (lookup_partial_symbol): Update. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index bc681cf..135741a 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -8464,16 +8464,13 @@ static struct breakpoint_ops catch_solib_breakpoint_ops; void add_solib_catchpoint (const char *arg, int is_load, int is_temp, int enabled) { - struct solib_catchpoint *c; struct gdbarch *gdbarch = get_current_arch (); - struct cleanup *cleanup; if (!arg) arg = ""; arg = skip_spaces_const (arg); - c = new solib_catchpoint (); - cleanup = make_cleanup (xfree, c); + std::unique_ptr<solib_catchpoint> c (new solib_catchpoint ()); if (*arg != '\0') { @@ -8483,13 +8480,12 @@ add_solib_catchpoint (const char *arg, int is_load, int is_temp, int enabled) } c->is_load = is_load; - init_catchpoint (c, gdbarch, is_temp, NULL, + init_catchpoint (c.get (), gdbarch, is_temp, NULL, &catch_solib_breakpoint_ops); c->enable_state = enabled ? bp_enabled : bp_disabled; - discard_cleanups (cleanup); - install_breakpoint (0, c, 1); + install_breakpoint (0, c.release (), 1); } /* A helper function that does all the work for "catch load" and |