summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1994-10-30 19:43:49 +0000
committerbde <bde@FreeBSD.org>1994-10-30 19:43:49 +0000
commitbae90071a15be813307b2a06b01f216de92953a5 (patch)
tree08bd5f8b78129e5367bc16aa7ce4f1ca7f791620 /sys
parent5fd22a0e226cd4db10e74a4388a75419769af9a0 (diff)
downloadFreeBSD-src-bae90071a15be813307b2a06b01f216de92953a5.zip
FreeBSD-src-bae90071a15be813307b2a06b01f216de92953a5.tar.gz
Don't attempt to free null cblocks. There may be less to free than
normal due to cblock resource starvation or malloc() failing when the device is opened.
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/subr_clist.c4
-rw-r--r--sys/kern/tty_subr.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index 26f42fb..46a8f1e 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -6,7 +6,7 @@
* of this software, nor does the author assume any responsibility
* for damages incurred with its use.
*
- * $Id: tty_subr.c,v 1.6 1994/09/13 16:02:20 davidg Exp $
+ * $Id: tty_subr.c,v 1.7 1994/09/25 19:33:50 phk Exp $
*/
/*
@@ -118,6 +118,8 @@ cblock_free_cblocks(number)
for (i = 0; i < number; ++i) {
tmp = cblock_alloc();
+ if (tmp == NULL)
+ return;
free(tmp, M_TTYS);
}
}
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 26f42fb..46a8f1e 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -6,7 +6,7 @@
* of this software, nor does the author assume any responsibility
* for damages incurred with its use.
*
- * $Id: tty_subr.c,v 1.6 1994/09/13 16:02:20 davidg Exp $
+ * $Id: tty_subr.c,v 1.7 1994/09/25 19:33:50 phk Exp $
*/
/*
@@ -118,6 +118,8 @@ cblock_free_cblocks(number)
for (i = 0; i < number; ++i) {
tmp = cblock_alloc();
+ if (tmp == NULL)
+ return;
free(tmp, M_TTYS);
}
}
OpenPOWER on IntegriCloud