diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-18 09:04:57 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-18 09:04:57 +0800 |
| commit | 074c0268fd32d6527e124cff386bb6b15cf90017 (patch) | |
| tree | 62111c3c70d46a738f15514e988a707409ca45f4 /src/keymap.c | |
| parent | db48eff8cf4a88393c0209f663ca194ee37fa747 (diff) | |
| parent | 5ef169ed701fa4f850fdca5563cdd468207d5d4f (diff) | |
| download | emacs-feature/android.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/androidfeature/android
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keymap.c b/src/keymap.c index 7f5777c9251..da2af98c2d6 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1363,7 +1363,7 @@ recognize the default bindings, just as `read-key-sequence' does. */) { USE_SAFE_ALLOCA; ptrdiff_t size = SCHARS (key_item), n; - if (INT_MULTIPLY_WRAPV (size, MAX_MULTIBYTE_LENGTH, &n)) + if (ckd_mul (&n, size, MAX_MULTIBYTE_LENGTH)) n = PTRDIFF_MAX; unsigned char *dst = SAFE_ALLOCA (n); unsigned char *p = dst; @@ -1411,7 +1411,7 @@ recognize the default bindings, just as `read-key-sequence' does. */) USE_SAFE_ALLOCA; ptrdiff_t size = SCHARS (lc_key), n; - if (INT_MULTIPLY_WRAPV (size, MAX_MULTIBYTE_LENGTH, &n)) + if (ckd_mul (&n, size, MAX_MULTIBYTE_LENGTH)) n = PTRDIFF_MAX; unsigned char *dst = SAFE_ALLOCA (n); @@ -2097,7 +2097,7 @@ For an approximate inverse of this, see `kbd'. */) /* This has one extra element at the end that we don't pass to Fconcat. */ ptrdiff_t size4; - if (INT_MULTIPLY_WRAPV (nkeys + nprefix, 4, &size4)) + if (ckd_mul (&size4, nkeys + nprefix, 4)) memory_full (SIZE_MAX); SAFE_ALLOCA_LISP (args, size4); |