From: Maria Matejka <mq@ucw.cz>
Date: Tue, 28 Feb 2023 14:19:21 +0000 (+0100)
Subject: Linpool: State restoration works in initial linpool state
X-Git-Tag: v3.0-alpha1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e6abea41eca5c18b03e46706cbfa2972085f954;p=thirdparty%2Fbird.git

Linpool: State restoration works in initial linpool state
---

diff --git a/lib/mempool.c b/lib/mempool.c
index 33eaec86a..d10f8f1c2 100644
--- a/lib/mempool.c
+++ b/lib/mempool.c
@@ -231,9 +231,9 @@ lp_restore(linpool *m, lp_state *p)
   struct lp_chunk *c;
 
   /* Move ptr to the saved pos and free all newer large chunks */
-  m->current = c = p->current;
-  m->ptr = p->ptr;
-  m->end = c ? c->data + LP_DATA_SIZE : NULL;
+  m->current = c = p->current ?: m->first;
+  m->ptr = p->ptr ?: (c ? c->data : NULL);
+  m->end = c ? (c->data + LP_DATA_SIZE) : NULL;
   m->total_large = p->total_large;
 
   while ((c = m->first_large) && (c != p->large))