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/buffer.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/buffer.c')
| -rw-r--r-- | src/buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/buffer.c b/src/buffer.c index 668c7035724..9bcace37e9b 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -3343,7 +3343,7 @@ record_overlay_string (struct sortstrlist *ssl, Lisp_Object str, else nbytes = SBYTES (str); - if (INT_ADD_WRAPV (ssl->bytes, nbytes, &nbytes)) + if (ckd_add (&nbytes, nbytes, ssl->bytes)) memory_full (SIZE_MAX); ssl->bytes = nbytes; @@ -3357,7 +3357,7 @@ record_overlay_string (struct sortstrlist *ssl, Lisp_Object str, else nbytes = SBYTES (str2); - if (INT_ADD_WRAPV (ssl->bytes, nbytes, &nbytes)) + if (ckd_add (&nbytes, nbytes, ssl->bytes)) memory_full (SIZE_MAX); ssl->bytes = nbytes; } @@ -3429,7 +3429,7 @@ overlay_strings (ptrdiff_t pos, struct window *w, unsigned char **pstr) unsigned char *p; ptrdiff_t total; - if (INT_ADD_WRAPV (overlay_heads.bytes, overlay_tails.bytes, &total)) + if (ckd_add (&total, overlay_heads.bytes, overlay_tails.bytes)) memory_full (SIZE_MAX); if (total > overlay_str_len) overlay_str_buf = xpalloc (overlay_str_buf, &overlay_str_len, |