1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 25fa2f150e..51e0dd926e 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -629,12 +629,12 @@ void free_all_mem(void)
    * were freed already. */
   p_acd = false;
   for (buf = firstbuf; buf != NULL; ) {
+    bufref_T bufref;
+    set_bufref(&bufref, buf);
     nextbuf = buf->b_next;
     close_buffer(NULL, buf, DOBUF_WIPE, false);
-    if (buf_valid(buf))
-      buf = nextbuf;            /* didn't work, try next one */
-    else
-      buf = firstbuf;
+    // Didn't work, try next one.
+    buf = bufref_valid(&bufref) ? nextbuf : firstbuf;
   }
 
   free_cmdline_buf();