diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-03-25 19:45:20 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-03-25 19:45:20 -0700 |
| commit | 70c90289ff7e2f1ca976618bcf342d9c65c746fc (patch) | |
| tree | b137a73907e3abed69bafe89483de0af3ce2b814 /malloc/malloc.c | |
| parent | 89a4419cc384c090b1eabe610647aa4e14436a3f (diff) | |
| parent | 34b514dff6acf8f1cac0afefd24049e025fd62ea (diff) | |
| download | glibc-70c90289ff7e2f1ca976618bcf342d9c65c746fc.tar glibc-70c90289ff7e2f1ca976618bcf342d9c65c746fc.tar.gz glibc-70c90289ff7e2f1ca976618bcf342d9c65c746fc.tar.bz2 glibc-70c90289ff7e2f1ca976618bcf342d9c65c746fc.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'malloc/malloc.c')
| -rw-r--r-- | malloc/malloc.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 763852ea3b..0004c878f3 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -4852,7 +4852,8 @@ _int_free(mstate av, mchunkptr p) free_perturb (chunk2mem(p), size - SIZE_SZ); set_fastchunks(av); - fb = &fastbin (av, fastbin_index(size)); + unsigned int idx = fastbin_index(size); + fb = &fastbin (av, idx); #ifdef ATOMIC_FASTBINS mchunkptr fd; @@ -4866,6 +4867,12 @@ _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); @@ -4877,6 +4884,12 @@ _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; |