From b0459c58c9f610b1c1d9bf9d9b9dba55ec2b3b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Thu, 16 Jan 2003 12:57:53 +0000 Subject: [PATCH] Clear part_set, part_size_type and part_offset_type before parsing the ascii label; otherwise checklabel() might report spurious errors because of leftovers from a previous pass. Reviewed by: bde MFC after: 1 week --- sbin/bsdlabel/bsdlabel.c | 3 +++ sbin/disklabel/disklabel.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 786ca6261f7b..bbcf0d08ed2c 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -957,6 +957,9 @@ getasciilabel(FILE *f, struct disklabel *lp) int lineno = 0, errors = 0; int i; + bzero(&part_set, sizeof(part_set)); + bzero(&part_size_type, sizeof(part_size_type)); + bzero(&part_offset_type, sizeof(part_offset_type)); lp->d_bbsize = BBSIZE; /* XXX */ lp->d_sbsize = 0; /* XXX */ while (fgets(line, sizeof(line) - 1, f)) { diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 786ca6261f7b..bbcf0d08ed2c 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -957,6 +957,9 @@ getasciilabel(FILE *f, struct disklabel *lp) int lineno = 0, errors = 0; int i; + bzero(&part_set, sizeof(part_set)); + bzero(&part_size_type, sizeof(part_size_type)); + bzero(&part_offset_type, sizeof(part_offset_type)); lp->d_bbsize = BBSIZE; /* XXX */ lp->d_sbsize = 0; /* XXX */ while (fgets(line, sizeof(line) - 1, f)) {