diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-03-19 20:44:51 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-03-19 20:44:51 +0200 |
| commit | c3a543123abeb8542f50fdd5068a4efe380634ec (patch) | |
| tree | 8521b6503b5bae0dcd89a4f34bd6c592748af4d1 /src | |
| parent | 231190b37f811933dc7da608fc442439d7b6acb1 (diff) | |
| download | emacs-c3a543123abeb8542f50fdd5068a4efe380634ec.tar.gz | |
Protect against too large size of 'recent-keys' vector
* src/keyboard.c (MAX_NUM_RECENT_KEYS): New macro.
(Flossage_size): Don't allow specifying too large lossage-size.
Fix data types. (Bug#62277)
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index b2816f8270b..f7aa496bb81 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -105,6 +105,13 @@ static bool single_kboard; /* Minimum allowed size of the recent_keys vector. */ #define MIN_NUM_RECENT_KEYS (100) +/* Maximum allowed size of the recent_keys vector. */ +#if INTPTR_MAX <= INT_MAX +# define MAX_NUM_RECENT_KEYS (INT_MAX / EMACS_INT_WIDTH / 10) +#else +# define MAX_NUM_RECENT_KEYS (INT_MAX / EMACS_INT_WIDTH) +#endif + /* Index for storing next element into recent_keys. */ static int recent_keys_index; @@ -10984,10 +10991,10 @@ The saved keystrokes are shown by `view-lossage'. */) if (!FIXNATP (arg)) user_error ("Value must be a positive integer"); - int osize = ASIZE (recent_keys); + ptrdiff_t osize = ASIZE (recent_keys); eassert (lossage_limit == osize); int min_size = MIN_NUM_RECENT_KEYS; - int new_size = XFIXNAT (arg); + EMACS_INT new_size = XFIXNAT (arg); if (new_size == osize) return make_fixnum (lossage_limit); @@ -10997,6 +11004,12 @@ The saved keystrokes are shown by `view-lossage'. */) AUTO_STRING (fmt, "Value must be >= %d"); Fsignal (Quser_error, list1 (CALLN (Fformat, fmt, make_fixnum (min_size)))); } + if (new_size > MAX_NUM_RECENT_KEYS) + { + AUTO_STRING (fmt, "Value must be <= %d"); + Fsignal (Quser_error, list1 (CALLN (Fformat, fmt, + make_fixnum (MAX_NUM_RECENT_KEYS)))); + } int kept_keys = new_size > osize ? total_keys : min (new_size, total_keys); update_recent_keys (new_size, kept_keys); |