diff options
| author | Tom Tromey <tom@tromey.com> | 2019-01-21 15:25:29 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2019-01-21 15:25:29 +0000 |
| commit | 2197ea1791698761983e0b8a7b3d6d2b50f87d1f (patch) | |
| tree | eecff65f98f1b03858f03fdc3b8165fba939c075 /libiberty | |
| parent | c73e7656f5f64a8ee544270adea13cc39ddae70d (diff) | |
| download | gcc-2197ea1791698761983e0b8a7b3d6d2b50f87d1f.zip gcc-2197ea1791698761983e0b8a7b3d6d2b50f87d1f.tar.gz gcc-2197ea1791698761983e0b8a7b3d6d2b50f87d1f.tar.bz2 | |
Fix leak in splay-tree
Philippe Waroquiers noticed a memory leak in gdb, which he tracked
down to a bug in splay-tree. splay_tree_remove does not call the
`delete_key' function when it removes the old node; but it should.
I looked at every splay tree in GCC and there is only one that passes
a non-NULL delete function -- the one in lto.c. That file does not
call splay_tree_remove. So, I think this is safe to check in.
I re-ran the LTO tests to double check.
libiberty/
* splay-tree.c (splay_tree_remove): Delete the key if necessary.
From-SVN: r268116
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/splay-tree.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index bcc0227..08d0a43 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2019-01-21 Tom Tromey <tom@tromey.com> + + * splay-tree.c (splay_tree_remove): Delete the key if necessary. + 2019-01-14 Tom Honermann <tom@honermann.net> * cp-demangle.c (cplus_demangle_builtin_types) diff --git a/libiberty/splay-tree.c b/libiberty/splay-tree.c index 920e68d..21d23c3 100644 --- a/libiberty/splay-tree.c +++ b/libiberty/splay-tree.c @@ -425,6 +425,8 @@ splay_tree_remove (splay_tree sp, splay_tree_key key) right = sp->root->right; /* Delete the root node itself. */ + if (sp->delete_key) + (*sp->delete_key) (sp->root->key); if (sp->delete_value) (*sp->delete_value) (sp->root->value); (*sp->deallocate) (sp->root, sp->allocate_data); |