lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

Fix malloc_info statistic. Fixes bug 16112

Browse Source
This commit is contained in:
Ondřej Bílka
2013-11-01 15:39:26 +01:00
parent 8f5de63892
commit 8b35e35d0f
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2013-11-01 Ondřej Bílka <neleai@seznam.cz>
[BZ #16112]
* malloc/malloc (malloc_info): Do not handle first bin as
special case.
2013-11-01 Chris Leonard <cjl@sugarlabs.org> 2013-11-01 Chris Leonard <cjl@sugarlabs.org>
* locale/iso-639.def: Add Central Nahuatl (nhn). * locale/iso-639.def: Add Central Nahuatl (nhn).

2
NEWS
View File

@ -17,7 +17,7 @@ Version 2.19
15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887, 15890, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887, 15890,
15892, 15893, 15895, 15897, 15905, 15909, 15917, 15919, 15921, 15923, 15892, 15893, 15895, 15897, 15905, 15909, 15917, 15919, 15921, 15923,
15939, 15948, 15963, 15966, 15988, 16032, 16034, 16036, 16037, 16041, 15939, 15948, 15963, 15966, 15988, 16032, 16034, 16036, 16037, 16041,
16071, 16072, 16074, 16078. 16071, 16072, 16074, 16078, 16112.
* CVE-2012-4412 The strcoll implementation caches indices and rules for * CVE-2012-4412 The strcoll implementation caches indices and rules for
large collation sequences to optimize multiple passes. This cache large collation sequences to optimize multiple passes. This cache

20
malloc/malloc.c
View File

@ -5049,23 +5049,11 @@ malloc_info (int options, FILE *fp)
sizes[i].total = sizes[i].count * sizes[i].to; sizes[i].total = sizes[i].count * sizes[i].to;
} }
mbinptr bin = bin_at (ar_ptr, 1);
struct malloc_chunk *r = bin->fd;
if (r != NULL)
{
while (r != bin)
{
++sizes[NFASTBINS].count;
sizes[NFASTBINS].total += r->size;
sizes[NFASTBINS].from = MIN (sizes[NFASTBINS].from, r->size);
sizes[NFASTBINS].to = MAX (sizes[NFASTBINS].to, r->size);
r = r->fd;
}
nblocks += sizes[NFASTBINS].count;
avail += sizes[NFASTBINS].total;
}
for (size_t i = 2; i < NBINS; ++i) mbinptr bin;
struct malloc_chunk *r;
for (size_t i = 1; i < NBINS; ++i)
{ {
bin = bin_at (ar_ptr, i); bin = bin_at (ar_ptr, i);
r = bin->fd; r = bin->fd;