diff mbox series

[gmane.comp.gdb.patches,RFA] Fix splay tree KEY leak detected in GDB test gdb.base/macscp.exp

Message ID 87h8dh81c6.fsf@tromey.com
State New
Headers show
Series [gmane.comp.gdb.patches,RFA] Fix splay tree KEY leak detected in GDB test gdb.base/macscp.exp | expand

Commit Message

Tom Tromey Feb. 6, 2019, 1:59 p.m. UTC 
Philippe Waroquiers found another splay-tree memory leak and sent this
patch to the gdb patch list.  I'm forwarding it here, as splay-tree is
canonically maintained in gcc; if approved I will check it in for him.

Note that the analysis from the previous splay-tree patch applies here
as well: there is a single user of the key-deletion functionality in
gcc, and I believe it remains safe with this patch.  (In fact, if
duplicate keys were ever used, this would fix a leak in gcc.  I am not
sure whether or not that can happen though.)

thanks,
Tom
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.

include/ChangeLog
2019-01-26  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-01-26  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.
---
 include/splay-tree.h   | 11 +++++++++--
 libiberty/splay-tree.c | 13 ++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

Comments

Richard Biener Feb. 6, 2019, 5:07 p.m. UTC | #1 
On February 6, 2019 2:59:21 PM GMT+01:00, Tom Tromey <tom@tromey.com> wrote:
>Philippe Waroquiers found another splay-tree memory leak and sent this
>patch to the gdb patch list.  I'm forwarding it here, as splay-tree is
>canonically maintained in gcc; if approved I will check it in for him.
>
>Note that the analysis from the previous splay-tree patch applies here
>as well: there is a single user of the key-deletion functionality in
>gcc, and I believe it remains safe with this patch.  (In fact, if
>duplicate keys were ever used, this would fix a leak in gcc.  I am not
>sure whether or not that can happen though.)

Didn't I approve the patch already? 

OK if not so. 

Richard. 

>thanks,
>Tom
diff mbox series

Patch

diff --git a/include/splay-tree.h b/include/splay-tree.h
index 0d26272943..da533dec18 100644
--- a/include/splay-tree.h
+++ b/include/splay-tree.h
@@ -58,11 +58,18 @@  typedef struct splay_tree_node_s *splay_tree_node;
 typedef int (*splay_tree_compare_fn) (splay_tree_key, splay_tree_key);
 
 /* The type of a function used to deallocate any resources associated
-   with the key.  */
+   with the key.  If you provide this function, the splay tree
+   will take the ownership of the memory of the splay_tree_key arg
+   of splay_tree_insert.  This function is called to release the keys
+   present in the tree when calling splay_tree_delete or splay_tree_remove.
+   If splay_tree_insert is called with a key equal to a key already
+   present in the tree, the old key and old value will be released.  */
 typedef void (*splay_tree_delete_key_fn) (splay_tree_key);
 
 /* The type of a function used to deallocate any resources associated
-   with the value.  */
+   with the value.  If you provide this function, the memory of the
+   splay_tree_value arg of splay_tree_insert is managed similarly to
+   the splay_tree_key memory: see splay_tree_delete_key_fn.  */
 typedef void (*splay_tree_delete_value_fn) (splay_tree_value);
 
 /* The type of a function used to iterate over the tree.  */
diff --git a/libiberty/splay-tree.c b/libiberty/splay-tree.c
index 21d23c38df..4bbb39a62c 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