[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99842: * minibuf.c (Fall_completions): Add more checks.

[Andreas Schwab]

------------------------------------------------------------
revno: 99842
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Tue 2010-06-08 21:42:10 +0200
message:
  * minibuf.c (Fall_completions): Add more checks.
modified:
  src/minibuf.c

=== modified file 'src/minibuf.c'
--- a/src/minibuf.c     2010-06-08 17:56:21 +0000
+++ b/src/minibuf.c     2010-06-08 19:42:10 +0000
@@ -1589,9 +1589,8 @@
   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 @@
        }
       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)