When tdelete() is used to delete the root node, don't return a

pointer to the freed root node, but return a pointer to the new
root node. POSIX does not define, what should be returned in
that case.

Fixes Coverity CID 2528.

ok millert@ otto@

1 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/libc/stdlib/tsearch.c b/src/lib/libc/stdlib/tsearch.c
index a5d0c2b9b3..667c57731b 100644
--- a/src/lib/libc/stdlib/tsearch.c
+++ b/src/lib/libc/stdlib/tsearch.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: tsearch.c,v 1.5 2005/03/30 18:51:49 pat Exp $ */
+/*      $OpenBSD: tsearch.c,v 1.6 2006/04/04 11:21:50 moritz Exp $      */
 
 /*
  * Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -86,6 +86,8 @@ tdelete(const void *vkey, void **vrootp,
             q->right = (*rootp)->right;
         }
     }
+    if (p == *rootp)
+        p = q;
     free((struct node_t *) *rootp);     /* D4: Free node */
     *rootp = q;                         /* link parent to new node */
     return(p);