diff options
| author | Paul Eggert | 2019-10-18 13:07:49 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-10-18 13:23:11 -0700 |
| commit | b72ff3667a137ca5d03f6a5c3cff722f004bc8ed (patch) | |
| tree | d162f5fcad5e194d40e9ebeeaef5b5d07e3b5bcf /src/xterm.c | |
| parent | 36c75c2a413beebc0b5163ba962cacfcea36db02 (diff) | |
| download | emacs-b72ff3667a137ca5d03f6a5c3cff722f004bc8ed.tar.gz emacs-b72ff3667a137ca5d03f6a5c3cff722f004bc8ed.zip | |
Fix integer-overflow bug in Time conversion
Problem reported by Stefan Monnier (Bug#37795).
* src/keyboard.c (make_lispy_position)
(make_scroll_bar_position, make_lispy_event):
* src/xterm.c (x_ewmh_activate_frame):
Use INT_TO_INTEGER to convert Time to a Lisp integer,
since the value might not be a fixnum.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c index 5d8b1482a6d..045589534fb 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -11589,7 +11589,8 @@ x_ewmh_activate_frame (struct frame *f) | |||
| 11589 | x_send_client_event (frame, make_fixnum (0), frame, | 11589 | x_send_client_event (frame, make_fixnum (0), frame, |
| 11590 | dpyinfo->Xatom_net_active_window, | 11590 | dpyinfo->Xatom_net_active_window, |
| 11591 | make_fixnum (32), | 11591 | make_fixnum (32), |
| 11592 | list2i (1, dpyinfo->last_user_time)); | 11592 | list2 (make_fixnum (1), |
| 11593 | INT_TO_INTEGER (dpyinfo->last_user_time))); | ||
| 11593 | } | 11594 | } |
| 11594 | } | 11595 | } |
| 11595 | 11596 | ||