- Fix spurious errors about "Could not generate request: out of

  memory".  The mesh detect cycle routine no longer wrongly stops
  the check when the calling mesh state is unique.

diff --git a/doc/Changelog b/doc/Changelog
index d2b76a0cd0955a68691be263ad793642bc9cde6e..accfaade91e4bdf49f1b339a51557f32a9823b81 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,8 @@
 4 March 2021: Wouter
        - iana portlist update.
+       - Fix spurious errors about "Could not generate request: out of
+         memory".  The mesh detect cycle routine no longer wrongly stops
+         the check when the calling mesh state is unique.
 
 26 February 2021: George
        - Fix for #367: rc_ports don't have ub_sock; skip cleaning up.

diff --git a/services/mesh.c b/services/mesh.c
index 91d23debf351cd868121ee8a614a1840beaa655a..88b3d15d083344d27494d74ab355302ecd65c8a2 100644 (file)
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1813,8 +1813,7 @@ mesh_detect_cycle(struct module_qstate* qstate, struct query_info* qinfo,
 {
        struct mesh_area* mesh = qstate->env->mesh;
        struct mesh_state* dep_m = NULL;
-       if(!mesh_state_is_unique(qstate->mesh_info))
-               dep_m = mesh_area_find(mesh, NULL, qinfo, flags, prime, valrec);
+       dep_m = mesh_area_find(mesh, NULL, qinfo, flags, prime, valrec);
        return mesh_detect_cycle_found(qstate, dep_m);
 }