1 files changed, 9 insertions, 0 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 3ad92331e01..ba23cc6ae33 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1458,7 +1458,16 @@ with SIGHUP.  */)
   unlock_buffer (b);
 #endif /* CLASH_DETECTION */
 
+  GCPRO1 (buf);
   kill_buffer_processes (buf);
+  UNGCPRO;
+
+  /* Killing buffer processes may run sentinels which may
+     have called kill-buffer.  */
+
+  if (NILP (b->name))
+    return Qnil;
+
   clear_charpos_cache (b);
 
   tem = Vinhibit_quit;