emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

pmap: use correct types for memory allocation

Browse Source 
Fixes error which did not happen always.  Changes of being affected by
the bug where greater the more there where pids defined as pmap argument.
The debian bug referral can almost certainly reproduce the problem,
especially when tried multiple times in row.

pmap: malloc.c:3096: sYSMALLOc: Assertion `(old_top == (((mbinptr)
(((char *) &((av)->bins[((1) - 1) * 2])) - __builtin_offsetof (struct
malloc_chunk, fd)))) && old_size == 0) || ((unsigned long) (old_size) >=
(unsigned long)((((__builtin_offsetof (struct malloc_chunk,
fd_nextsize))+((2 * (sizeof(size_t))) - 1)) & ~((2 * (sizeof(size_t))) -
1))) && ((old_top)->size & 0x1) && ((unsigned long)old_end & pagemask) ==
0)' failed.

Reported-by: lee <lee@yun.yagibdah.de>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688180
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2012-11-02 17:50:50 +00:00 committed by Craig Small
parent ee03bb92cb
commit c043c47ddd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmap.c
View File

@ -661,7 +661,7 @@ int main(int argc, char **argv)
x_option && (d_option || X_option)) x_option && (d_option || X_option))
xerrx(EXIT_FAILURE, _("options -d, -x, -X are mutually exclusive")); xerrx(EXIT_FAILURE, _("options -d, -x, -X are mutually exclusive"));
pidlist = xmalloc(sizeof(unsigned) * argc); pidlist = xmalloc(sizeof(unsigned long) * argc);
while (*argv) { while (*argv) {
char *walk = *argv++; char *walk = *argv++;

4
proc/alloc.c
View File

@ -50,14 +50,14 @@ void *xcalloc(unsigned int size) {
return p; return p;
} }
void *xmalloc(unsigned int size) { void *xmalloc(size_t size) {
void *p; void *p;
if (size == 0) if (size == 0)
++size; ++size;
p = malloc(size); p = malloc(size);
if (!p) { if (!p) {
xalloc_err_handler("%s failed to allocate %u bytes of memory", __func__, size); xalloc_err_handler("%s failed to allocate %zu bytes of memory", __func__, size);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
return(p); return(p);

2
proc/alloc.h
View File

@ -9,7 +9,7 @@ EXTERN_C_BEGIN
extern message_fn xalloc_err_handler; extern message_fn xalloc_err_handler;
extern void *xcalloc(unsigned int size) MALLOC; extern void *xcalloc(unsigned int size) MALLOC;
extern void *xmalloc(unsigned int size) MALLOC; extern void *xmalloc(size_t size) MALLOC;
extern void *xrealloc(void *oldp, unsigned int size) MALLOC; extern void *xrealloc(void *oldp, unsigned int size) MALLOC;
extern char *xstrdup(const char *str) MALLOC; extern char *xstrdup(const char *str) MALLOC;