mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 13:10:57 -08:00
Code Issues Projects Releases Wiki Activity

* region-cache.c (move_cache_gap): Check for size calculation overflow.

Browse source
This commit is contained in:
Paul Eggert 2011-07-28 18:10:08 -07:00
parent bf2da747e9
commit 7d56f94097
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -1,5 +1,7 @@
2011-07-29 Paul Eggert <eggert@cs.ucla.edu>
* region-cache.c (move_cache_gap): Check for size calculation overflow.
* process.c (Fnetwork_interface_list): Check for overflow
in size calculation.

13
src/region-cache.c
View file

@ -247,11 +247,16 @@ move_cache_gap (struct region_cache *c, EMACS_INT pos, EMACS_INT min_size)
if (gap_len < min_size)
{
EMACS_INT i;
ptrdiff_t cache_len_max =
min (PTRDIFF_MAX, SIZE_MAX) / sizeof *c->boundaries;
ptrdiff_t min_size_max = cache_len_max - c->cache_len;
/* Always make at least NEW_CACHE_GAP elements, as long as we're
expanding anyway. */
if (min_size < NEW_CACHE_GAP)
min_size = NEW_CACHE_GAP;
if (min_size_max < min_size)
memory_full (SIZE_MAX);
/* Unless running out of space, make at least NEW_CACHE_GAP
elements, as long as we're expanding anyway. */
min_size = max (min_size, min (min_size_max, NEW_CACHE_GAP));
c->boundaries =
(struct boundary *) xrealloc (c->boundaries,