summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-06-08 18:53:11 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-06-08 18:53:11 +0200
commit9b27fd9f75698a1b12dd071c77c970170392a704 (patch)
tree2f9a6ac3de991ae0d359850568e4ec14a6f93062 /src
parent2d9a4946e70052df156d69d7737eb8e069933d21 (diff)
downloademacs-9b27fd9f75698a1b12dd071c77c970170392a704.tar.gz
* minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/minibuf.c2
2 files changed, 5 insertions, 1 deletions
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)