diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-06-08 17:39:35 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-06-08 17:39:35 +0300 |
| commit | 296dadb14e19926de1fc5e0015cb8d4f10f9547a (patch) | |
| tree | 127d453db3432952faa2472b5c434a2e61771e99 /src/keymap.c | |
| parent | a04d35cb02528c5584f01c1e3a2bbd86c943b221 (diff) | |
| download | emacs-296dadb14e19926de1fc5e0015cb8d4f10f9547a.tar.gz | |
Avoid crashes when key-binding is called from a timer
* src/keymap.c (Fkey_binding): Don't segfault if called with an
empty vector as KEY. (Bug#20705)
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/keymap.c b/src/keymap.c index 8f4ac0dd437..b69b409fc2d 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1652,10 +1652,14 @@ specified buffer position instead of point are used. if (NILP (position) && VECTORP (key)) { - Lisp_Object event - /* mouse events may have a symbolic prefix indicating the - scrollbar or mode line */ - = AREF (key, SYMBOLP (AREF (key, 0)) && ASIZE (key) > 1 ? 1 : 0); + Lisp_Object event; + + if (ASIZE (key) == 0) + return Qnil; + + /* mouse events may have a symbolic prefix indicating the + scrollbar or mode line */ + event = AREF (key, SYMBOLP (AREF (key, 0)) && ASIZE (key) > 1 ? 1 : 0); /* We are not interested in locations without event data */ |