fix aliasing violations in tsearch functions

patch by nsz. the actual object the caller has storing the tree root
has type void *, so accessing it as struct node * is not valid.
instead, simply access the value, move it to a temporary of the
appropriate type and work from there, then move the result back.

diff --git a/src/search/tsearch_avl.c b/src/search/tsearch_avl.c
index b56159b9baf05041ba3958cb8bf949602574190f..86200928ef6c6390a0d8c8563d7a375e92c01605 100644 (file)
--- a/src/search/tsearch_avl.c
+++ b/src/search/tsearch_avl.c
@@ -138,9 +138,13 @@ static struct node *remove(struct node **n, const void *k,
 void *tdelete(const void *restrict key, void **restrict rootp,
        int(*compar)(const void *, const void *))
 {
+       struct node *n = *rootp;
+       struct node *ret;
        /* last argument is arbitrary non-null pointer
           which is returned when the root node is deleted */
-       return remove((void*)rootp, key, compar, *rootp);
+       ret = remove(&n, key, compar, n);
+       *rootp = n;
+       return ret;
 }
 
 void *tfind(const void *key, void *const *rootp,
@@ -153,7 +157,11 @@ void *tsearch(const void *key, void **rootp,
        int (*compar)(const void *, const void *))
 {
        int new = 0;
-       return insert((void*)rootp, key, compar, &new);
+       struct node *n = *rootp;
+       struct node *ret;
+       ret = insert(&n, key, compar, &new);
+       *rootp = n;
+       return ret;
 }
 
 static void walk(const struct node *r, void (*action)(const void *, VISIT, int), int d)