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/alloc.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/alloc.c')
| -rw-r--r-- | src/alloc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/alloc.c b/src/alloc.c index 0548a09cb8b..bb8e97f8737 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -2543,10 +2543,7 @@ free_cons (struct Lisp_Cons *ptr) ptr->u.s.u.chain = cons_free_list; ptr->u.s.car = dead_object (); cons_free_list = ptr; - /* Use a temporary signed variable, since otherwise INT_ADD_WRAPV - might incorrectly return non-zero. */ - int incr = sizeof *ptr; - if (INT_ADD_WRAPV (consing_until_gc, incr, &consing_until_gc)) + if (INT_ADD_WRAPV (consing_until_gc, sizeof *ptr, &consing_until_gc)) consing_until_gc = INTMAX_MAX; gcstat.total_free_conses++; } |