From 2d2da648f6aa07cfca3d6065d9126897e42927a1 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 2 Aug 2013 21:13:16 -0400 Subject: 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. --- src/search/tsearch_avl.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/search') diff --git a/src/search/tsearch_avl.c b/src/search/tsearch_avl.c index b56159b9..86200928 100644 --- 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) -- cgit v1.2.1