* minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378).

diff --git a/src/ChangeLog b/src/ChangeLog
index 0402c8e6d6cae4e10b14b645e1b0956ad391b250..5dc2c25a984bfc6b52f9a6bf96518e969260ef7c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-08  Juanma Barranquero  <lekktu@gmail.com>
+
+       * minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378).
+
 2010-06-03  Andreas Schwab  <schwab@linux-m68k.org>
 
        * process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4

diff --git a/src/minibuf.c b/src/minibuf.c
index ad81bfdd0b493c3477880068c18bfba8fb4ed71a..0a57d2a82eb0c7143a1630fb0a10f65d7b548536 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1590,7 +1590,7 @@ with a space are ignored unless STRING itself starts with a space.  */)
   if (type == 2)
     {
       obsize = XVECTOR (collection)->size;
-      bucket = XVECTOR (collection)->contents[index];
+      bucket = obsize ? XVECTOR (collection)->contents[index] : zero;
     }
 
   while (1)