OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unwanted malloc changes, again.

This commit is contained in:
Ulrich Drepper 2010-03-26 04:00:10 -07:00
parent 70c90289ff
commit 3e259dbb32
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
malloc/malloc.c
View File

@ -4852,8 +4852,7 @@ _int_free(mstate av, mchunkptr p)
free_perturb (chunk2mem(p), size - SIZE_SZ);
set_fastchunks(av);
unsigned int idx = fastbin_index(size);
fb = &fastbin (av, idx);
fb = &fastbin (av, fastbin_index(size));
#ifdef ATOMIC_FASTBINS
mchunkptr fd;
@ -4867,12 +4866,6 @@ _int_free(mstate av, mchunkptr p)
errstr = "double free or corruption (fasttop)";
goto errout;
}
if (old != NULL
&& __builtin_expect (fastbin_index(chunksize(old)) != idx, 0))
{
errstr = "invalid fastbin entry (free)";
goto errout;
}
p->fd = fd = old;
}
while ((old = catomic_compare_and_exchange_val_rel (fb, p, fd)) != fd);
@ -4884,12 +4877,6 @@ _int_free(mstate av, mchunkptr p)
errstr = "double free or corruption (fasttop)";
goto errout;
}
if (*fb != NULL
&& __builtin_expect (fastbin_index(chunksize(*fb)) != idx, 0))
{
errstr = "invalid fastbin entry (free)";
goto errout;
}
p->fd = *fb;
*fb = p;

6
malloc/tst-mallocstate.c
View File

@ -51,7 +51,6 @@ main (void)
for (i=0; i<100; ++i)
{
printf("round %li\n", i);
save_state = malloc_get_state ();
if (save_state == NULL)
{
@ -65,18 +64,13 @@ printf("round %li\n", i);
merror ("realloc (i*4) failed.");
free (save_state);
}
puts("done");
p1 = realloc (p1, 40);
puts("after realloc");
free (p2);
puts("after free 1");
p2 = malloc (10);
puts("after malloc");
if (p2 == NULL)
merror ("malloc (10) failed.");
free (p1);
puts("after free 2");
return errors != 0;
}