From 61bbc189632c540029ff94b1a2de61d5d4562d11 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Thu, 21 Jan 1993 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1993-01-21 --- port/alloc.c | 7 ++++--- port/devcons.c | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/port/alloc.c b/port/alloc.c index aa5ff4cda66f9fc84a8c4d6f1c86915c287d1862..814856a2d33b364b6791bb06769c747b96c9e855 100644 --- a/port/alloc.c +++ b/port/alloc.c @@ -276,12 +276,13 @@ good: arena.btab[pow] = bp->next; unlock(&arena); - if(bp->magic != 0) - panic("malloc %lux", bp->magic); + if(bp->magic != 0 || bp->size != pow) + panic("malloc bp %lux magic %lux size %d next %lux pow %d", bp, + bp->magic, bp->size, bp->next, pow); bp->magic = Magic2n; - memset(bp->data, 0, size); + memset(bp->data, 0, size); return bp->data; } unlock(&arena); diff --git a/port/devcons.c b/port/devcons.c index 6a3dfe9cf6f47f93e9e494d815c46c584bf9adbe..69bc7b041432534195490bc57c34fee66c02e9a0 100644 --- a/port/devcons.c +++ b/port/devcons.c @@ -170,7 +170,6 @@ panic(char *fmt, ...) n = doprint(buf+strlen(buf), buf+sizeof(buf), fmt, (&fmt+1)) - buf; buf[n] = '\n'; putstrn(buf, n+1); - xsummary(); dumpstack(); exit(1); }