diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2019-02-12 13:02:48 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-02-12 06:06:19 -0700 |
| commit | e20773049fde7b9a123fda4485259fc06249b22f (patch) | |
| tree | c5c01da0056ac3e64cabcdd96b44744e791c4278 /libiberty | |
| parent | 04d7fa2132c05b962d85e2047646e15b8a490f4e (diff) | |
| download | binutils-gdb-e20773049fde7b9a123fda4485259fc06249b22f.tar.gz | |
Fix splay tree KEY leak detected in GDB test gdb.base/macscp.exp
When a node is removed from a splay tree, the splay tree was
not using the function splay_tree_delete_key_fn to release the key.
This was causing a leak, fixed by Tom Tromey.
This patch fixes another key leak, that happens when a key equal to
a key already present is inserted. In such a case, we have to release
the old KEY.
Note that this is based on the assumption that the caller always
allocates a new KEY when doing an insert.
Also, clarify the documentation about when the release functions are
called.
2019-02-11 Philippe Waroquiers <philippe.waroquiers@skynet.be>
* splay-tree.h (splay_tree_delete_key_fn): Update comment.
(splay_tree_delete_value_fn): Likewise.
libiberty/ChangeLog
2019-02-11 Philippe Waroquiers <philippe.waroquiers@skynet.be>
* splay-tree.c (splay_tree_insert): Also release old KEY in case
of insertion of a key equal to an already present key.
(splay_tree_new_typed_alloc): Update comment.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@268793 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/splay-tree.c | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 496d76d3ff4..c9ff317b6fd 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2019-02-11 Philippe Waroquiers <philippe.waroquiers@skynet.be> + + * splay-tree.c (splay_tree_insert): Also release old KEY in case + of insertion of a key equal to an already present key. + (splay_tree_new_typed_alloc): Update comment. + 2019-01-21 Tom Tromey <tom@tromey.com> * splay-tree.c (splay_tree_remove): Delete the key if necessary. diff --git a/libiberty/splay-tree.c b/libiberty/splay-tree.c index 21d23c38dfc..4bbb39a62ca 100644 --- a/libiberty/splay-tree.c +++ b/libiberty/splay-tree.c @@ -318,7 +318,11 @@ different types need to be allocated with different allocators. The splay tree will use @var{compare_fn} to compare nodes, @var{delete_key_fn} to deallocate keys, and @var{delete_value_fn} to -deallocate values. +deallocate values. Keys and values will be deallocated when the +tree is deleted using splay_tree_delete or when a node is removed +using splay_tree_remove. splay_tree_insert will release the previously +inserted key and value using @var{delete_key_fn} and @var{delete_value_fn} +if the inserted key is already found in the tree. @end deftypefn @@ -372,10 +376,13 @@ splay_tree_insert (splay_tree sp, splay_tree_key key, splay_tree_value value) if (sp->root && comparison == 0) { - /* If the root of the tree already has the indicated KEY, just - replace the value with VALUE. */ + /* If the root of the tree already has the indicated KEY, delete + the old key and old value, and replace them with KEY and VALUE. */ + if (sp->delete_key) + (*sp->delete_key) (sp->root->key); if (sp->delete_value) (*sp->delete_value)(sp->root->value); + sp->root->key = key; sp->root->value = value; } else |