From: Andreas Schwab <schwab@linux-m68k.org>
Date: Tue, 8 Jun 2010 19:42:10 +0000 (+0200)
Subject: * minibuf.c (Fall_completions): Add more checks.
X-Git-Tag: emacs-pretest-23.2.90~139^2~140
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=373bf2b76c9ee3ddefa55aae26134ddadf9cf544;p=emacs.git

* minibuf.c (Fall_completions): Add more checks.
---

diff --git a/src/minibuf.c b/src/minibuf.c
index 54b0b1510ce..539a953f7ee 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1589,9 +1589,8 @@ with a space are ignored unless STRING itself starts with a space.  */)
   tail = collection;
   if (type == 2)
     {
+      collection = check_obarray (collection);
       obsize = XVECTOR (collection)->size;
-      if (obsize == 0)
-	return Qnil;
       bucket = XVECTOR (collection)->contents[index];
     }
 
@@ -1612,8 +1611,10 @@ with a space are ignored unless STRING itself starts with a space.  */)
 	}
       else if (type == 2)
 	{
-	  if (SYMBOLP (bucket))
+	  if (!EQ (bucket, zero))
 	    {
+	      if (!SYMBOLP (bucket))
+		error ("Bad data in guts of obarray");
 	      elt = bucket;
 	      eltstring = elt;
 	      if (XSYMBOL (bucket)->next)