1 files changed, 8 insertions, 2 deletions
diff --git a/src/minibuf.c b/src/minibuf.c
index 9ce0979adb4..d3b3f6e6f35 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1403,9 +1403,13 @@ It can find the completion buffer in `standard-output'.")
   register Lisp_Object tail, elt;
   register int i;
   int column = 0;
-  /* No GCPRO needed, since (when it matters) every variable
-     points to a non-string that is pointed to by COMPLETIONS.  */
+  struct gcpro gcpro1;
   struct buffer *old = current_buffer;
+
+  /* Note that (when it matters) every variable
+     points to a non-string that is pointed to by COMPLETIONS.  */
+  GCPRO1 (completions);
+
   if (XTYPE (Vstandard_output) == Lisp_Buffer)
     set_buffer_internal (XBUFFER (Vstandard_output));
 
@@ -1467,6 +1471,8 @@ It can find the completion buffer in `standard-output'.")
 	}
     }
 
+  UNGCPRO;
+
   if (XTYPE (Vstandard_output) == Lisp_Buffer)
     set_buffer_internal (old);