procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #12196 with incorrect memory allocations for region-cache.

Browse source 
src/region-cache.c (move_cache_gap): Update gap_len using the actual
 growth of the boundaries array.  Do not change cache_len.
This commit is contained in:
Eli Zaretskii 2012-08-15 19:21:41 +03:00
parent 4e6a86c633
commit eb424fe3d6
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2012-08-15 Eli Zaretskii <eliz@gnu.org>
* region-cache.c (move_cache_gap): Update gap_len using the actual
growth of the boundaries array. Do not change cache_len.
(Bug#12196)
2012-08-15 Dmitry Antipov <dmantipov@yandex.ru>
Generalize and cleanup font subsystem checks.

6
src/region-cache.c
View file

@ -245,16 +245,16 @@ move_cache_gap (struct region_cache *c, ptrdiff_t pos, ptrdiff_t min_size)
when the portion after the gap is smallest. */
if (gap_len < min_size)
{
ptrdiff_t i;
ptrdiff_t i, nboundaries = c->cache_len;
c->boundaries =
xpalloc (c->boundaries, &c->cache_len, min_size, -1,
xpalloc (c->boundaries, &nboundaries, min_size - gap_len, -1,
sizeof *c->boundaries);
/* Some systems don't provide a version of the copy routine that
can be trusted to shift memory upward into an overlapping
region. memmove isn't widely available. */
min_size -= gap_len;
min_size = nboundaries - c->cache_len - gap_len;
for (i = c->cache_len - 1; i >= gap_start; i--)
{
c->boundaries[i + min_size].pos = c->boundaries[i + gap_len].pos;