From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 8 Jun 2010 16:53:11 +0000 (+0200)
Subject: * minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378).
X-Git-Tag: emacs-pretest-23.2.90~139^2~142
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b27fd9f75698a1b12dd071c77c970170392a704;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0402c8e6d6c..5dc2c25a984 100644
--- 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 ad81bfdd0b4..0a57d2a82eb 100644
--- 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)