Add simple cycle detection to cf_item_add

diff --git a/src/main/conffile.c b/src/main/conffile.c
index 3aba18be339207ec05ea21a75985ee2d99bd80de..e9109f0ecfc2c607b79d0006b54069701e730143 100644 (file)
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -528,6 +528,10 @@ int cf_pair_replace(CONF_SECTION *cs, CONF_PAIR *cp, char const *value)
  */
 void cf_item_add(CONF_SECTION *cs, CONF_ITEM *ci)
 {
+       CONF_ITEM *first = ci;
+
+       rad_assert((void *)cs != (void *)ci);
+
        if (!cs || !ci) return;
 
        if (!cs->children) {
@@ -542,6 +546,8 @@ void cf_item_add(CONF_SECTION *cs, CONF_ITEM *ci)
         *      Update the trees (and tail) for each item added.
         */
        for (/* nothing */; ci != NULL; ci = ci->next) {
+               rad_assert(ci->next != first);  /* simple cycle detection */
+
                cs->tail = ci;
 
                /*