src/utils_cache.c: Make really sure to free the right cache entry.

Make sure we do not try to free a (possibly some random) cache entry after
removing it from the AVL tree. Potentially, this might have caused invalid
free()s in some rare situations.

diff --git a/src/utils_cache.c b/src/utils_cache.c
index 60d3283278e394dfd673029619cac16f7de64baf..33dc6b1508490fde259a988382ec48f32c0bfd96 100644 (file)
--- a/src/utils_cache.c
+++ b/src/utils_cache.c
@@ -296,6 +296,7 @@ int uc_check_timeout (void)
     {
       DEBUG ("uc_check_timeout: %s is missing but ``uninteresting''",
          keys[i]);
+      ce = NULL;
       status = c_avl_remove (cache_tree, keys[i],
          (void *) &key, (void *) &ce);
       if (status != 0)
@@ -304,7 +305,8 @@ int uc_check_timeout (void)
       }
       sfree (keys[i]);
       sfree (key);
-      cache_free (ce);
+      if (ce != NULL)
+        cache_free (ce);
       continue;
     }