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

Further follow-up to last change in gmalloc.c.

Browse source 
* src/gmalloc.c (aligned_alloc): Clarify the code by making `adj'
represent the actual adjustment needed for alignment.
This commit is contained in:
Ken Brown 2014-03-04 14:02:49 -05:00
parent 201572eca8
commit 94a089b5f8
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-03-04 Ken Brown <kbrown@cornell.edu>
* gmalloc.c (aligned_alloc): Clarify the code by making `adj'
represent the actual adjustment needed for alignment.
2014-03-04 Eli Zaretskii <eliz@gnu.org>
* gmalloc.c (aligned_alloc): Don't allocate more memory than

22
src/gmalloc.c
View file

@ -1597,34 +1597,34 @@ aligned_alloc (size_t alignment, size_t size)
/* Figure out how much we will need to pad this particular block
to achieve the required alignment. */
adj = (uintptr_t) result % alignment;
if (adj == 0)
adj = alignment;
adj = alignment - (uintptr_t) result % alignment;
if (adj == alignment)
adj = 0;
if (adj != 1)
if (adj != alignment - 1)
{
do
{
/* Reallocate the block with only as much excess as it
needs. */
free (result);
result = malloc (size + alignment - adj);
result = malloc (size + adj);
if (result == NULL) /* Impossible unless interrupted. */
return NULL;
lastadj = adj;
adj = (uintptr_t) result % alignment;
if (adj == 0)
adj = alignment;
adj = alignment - (uintptr_t) result % alignment;
if (adj == alignment)
adj = 0;
/* It's conceivable we might have been so unlucky as to get
a different block with weaker alignment. If so, this
block is too short to contain SIZE after alignment
correction. So we must try again and get another block,
slightly larger. */
} while (adj < lastadj);
} while (adj > lastadj);
}
if (adj != alignment)
if (adj != 0)
{
/* Record this block in the list of aligned blocks, so that `free'
can identify the pointer it is passed, which will be in the middle
@ -1648,7 +1648,7 @@ aligned_alloc (size_t alignment, size_t size)
if (l != NULL)
{
l->exact = result;
result = l->aligned = (char *) result + alignment - adj;
result = l->aligned = (char *) result + adj;
}
UNLOCK_ALIGNED_BLOCKS ();
if (l == NULL)