+2004-10-30 Andreas Schwab <schwab@suse.de>
+
+ * sysdeps/unix/sysv/linux/waitid.c: Include <stddef.h> for NULL.
+
+2004-10-30 Ulrich Drepper <drepper@redhat.com>
+
+ * malloc/malloc.c (_int_free): Use unique comments for the error
+ cases.
+
2004-10-28 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/i386/tls.h (_hurd_tls_fork): Use i386_thread_state
/* free(0) has no effect */
if (mem != 0) {
+ const char *errstr = NULL;
+
p = mem2chunk(mem);
size = chunksize(p);
here by accident or by "design" from some intruder. */
if (__builtin_expect ((uintptr_t) p > (uintptr_t) -size, 0))
{
- malloc_printerr (check_action, "free(): invalid pointer", mem);
+ errstr = "free(): invalid pointer";
+ errout:
+ malloc_printerr (check_action, errstr, mem);
return;
}
record we are going to add (i.e., double free). */
if (__builtin_expect (*fb == p, 0))
{
- double_free:
- malloc_printerr (check_action, "double free or corruption", mem);
- return;
+ errstr = "double free or corruption (fasttop)";
+ goto errout;
}
p->fd = *fb;
*fb = p;
/* Lightweight tests: check whether the block is already the
top block. */
if (__builtin_expect (p == av->top, 0))
- goto double_free;
+ {
+ errstr = "double free or corruption (top)";
+ goto errout;
+ }
/* Or whether the next chunk is beyond the boundaries of the arena. */
if (__builtin_expect (contiguous (av)
&& (char *) nextchunk
>= ((char *) av->top + chunksize(av->top)), 0))
- goto double_free;
+ {
+ errstr = "double free or corruption (out)";
+ goto errout;
+ }
/* Or whether the block is actually not marked used. */
if (__builtin_expect (!prev_inuse(nextchunk), 0))
- goto double_free;
+ {
+ errstr = "double free or corruption (!prev)";
+ goto errout;
+ }
nextsize = chunksize(nextchunk);
assert(nextsize > 0);