diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-08-14 18:24:02 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-08-14 18:24:33 -0700 |
| commit | 2098e8afaf1c5235ba38c0156f680b8e435d9fdd (patch) | |
| tree | 2cde909326273f76ae2bb58b7d7cdfa350951058 /src/casefiddle.c | |
| parent | b898528fdc69c9ac58895f8be81163dc304bd59b (diff) | |
| download | emacs-2098e8afaf1c5235ba38c0156f680b8e435d9fdd.tar.gz | |
Remove INT_ADD_WRAPV bug workarounds
* src/alloc.c (free_cons):
* src/casefiddle.c (do_casify_multibyte_string):
* src/editfns.c (styled_format):
* src/image.c (png_load_body):
Remove recent workarounds for INT_ADD_WRAPV bugs since
the bugs have been fixed (Bug#37006).
Diffstat (limited to 'src/casefiddle.c')
| -rw-r--r-- | src/casefiddle.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/casefiddle.c b/src/casefiddle.c index 741973e40af..ee292dda9b3 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -265,11 +265,8 @@ do_casify_multibyte_string (struct casing_context *ctx, Lisp_Object obj) ptrdiff_t size = SCHARS (obj), n; USE_SAFE_ALLOCA; - /* Use a temporary signed variable, since otherwise INT_ADD_WRAPV - might incorrectly return non-zero. */ - ptrdiff_t casing_str_buf_size = sizeof (struct casing_str_buf); if (INT_MULTIPLY_WRAPV (size, MAX_MULTIBYTE_LENGTH, &n) - || INT_ADD_WRAPV (n, casing_str_buf_size, &n)) + || INT_ADD_WRAPV (n, sizeof (struct casing_str_buf), &n)) n = PTRDIFF_MAX; unsigned char *dst = SAFE_ALLOCA (n); unsigned char *dst_end = dst + n; |