MINOR: pools: add a new flag to declare static registrations

We must not free these ones when destroying a pool, so let's dedicate
them a flag to mention that they are static. For now we don't have any
such.

diff --git a/include/haproxy/pool-t.h b/include/haproxy/pool-t.h
index 1801f135bed4fb7853e6d040e15538c2b2cd540b..524c871b82cced8f9f673a442076d68ded7d441a 100644 (file)
--- a/include/haproxy/pool-t.h
+++ b/include/haproxy/pool-t.h
@@ -28,6 +28,7 @@
 #define MEM_F_SHARED   0x1
 #define MEM_F_EXACT    0x2
 #define MEM_F_UAF      0x4
+#define MEM_F_STATREG  0x8 /* static registration: do not free it! */
 
 /* A special pointer for the pool's free_list that indicates someone is
  * currently manipulating it. Serves as a short-lived lock.

diff --git a/src/pool.c b/src/pool.c
index 159a28a1b2c31adbddc025f3247ac84a1b3bcace..43359403fbd8c6ff60d07fae833d42cd9ae6c1ea 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -1049,7 +1049,8 @@ void *pool_destroy(struct pool_head *pool)
 
                        list_for_each_entry_safe(reg, back, &pool->regs, list) {
                                LIST_DELETE(&reg->list);
-                               free(reg);
+                               if (!(reg->flags & MEM_F_STATREG))
+                                       free(reg);
                        }
 
                        LIST_DELETE(&pool->list);