diff options
| author | Ken Raeburn <raeburn@raeburn.org> | 2015-11-24 01:16:10 -0500 |
|---|---|---|
| committer | Ken Raeburn <raeburn@raeburn.org> | 2015-11-24 03:51:13 -0500 |
| commit | cb1bd3496594d5e4060d990b4c6bac748fb974c9 (patch) | |
| tree | 96dc17b8a41b4207c33a45fee7eaf839dc54d0c9 /src/keyboard.c | |
| parent | b8bf03161123de6de5570fd3f4d1cf3ed94084e1 (diff) | |
| download | emacs-cb1bd3496594d5e4060d990b4c6bac748fb974c9.tar.gz | |
Fix kbd_buffer iteration loop in readable_events
* src/keyboard.c (readable_events): Wrap the event pointer back to the
start of the kbd_buffer array inside the top of the loop instead of
right before checking the loop condition, since kbd_fetch_ptr and
kbd_store_ptr point past the end of the array to mean that element 0
is next. (bug#21935)
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 849066c3c26..c9e58e7a086 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3313,14 +3313,12 @@ readable_events (int flags) #endif )) { - union buffered_input_event *event; - - event = ((kbd_fetch_ptr < kbd_buffer + KBD_BUFFER_SIZE) - ? kbd_fetch_ptr - : kbd_buffer); + union buffered_input_event *event = kbd_fetch_ptr; do { + if (event == kbd_buffer + KBD_BUFFER_SIZE) + event = kbd_buffer; if (!( #ifdef USE_TOOLKIT_SCROLL_BARS (flags & READABLE_EVENTS_FILTER_EVENTS) && @@ -3337,8 +3335,6 @@ readable_events (int flags) && event->kind == BUFFER_SWITCH_EVENT)) return 1; event++; - if (event == kbd_buffer + KBD_BUFFER_SIZE) - event = kbd_buffer; } while (event != kbd_store_ptr); } |