From owner-freebsd-bugs Tue Jul 16 7: 0:12 2002 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6350137B400 for ; Tue, 16 Jul 2002 07:00:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7137E43E42 for ; Tue, 16 Jul 2002 07:00:04 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6GE04JU097507 for ; Tue, 16 Jul 2002 07:00:04 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6GE04xH097506; Tue, 16 Jul 2002 07:00:04 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BEFDF37B400 for ; Tue, 16 Jul 2002 06:58:42 -0700 (PDT) Received: from smtp.www-service.de (smtp.www-service.de [212.77.161.16]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61AC443E31 for ; Tue, 16 Jul 2002 06:58:41 -0700 (PDT) (envelope-from thz@Lennartz-electronic.de) Received: from swd2.tue.le (pD95033C1.dip.t-dialin.net [217.80.51.193]) by smtp.www-service.de (8.11.6/8.11.6) with ESMTP id g6GFHjX19483 for ; Tue, 16 Jul 2002 17:17:45 +0200 Received: from mezcal.tue.le (mezcal.tue.le [192.168.201.20]) by swd2.tue.le (8.12.3/8.12.3) with ESMTP id g6GDgNXj049653 for ; Tue, 16 Jul 2002 15:42:23 +0200 (CEST) (envelope-from thz@mezcal.tue.le) Received: from mezcal.tue.le (localhost [127.0.0.1]) by mezcal.tue.le (8.12.3/8.12.3) with ESMTP id g6GDgNUM072666 for ; Tue, 16 Jul 2002 15:42:23 +0200 (CEST) (envelope-from thz@mezcal.tue.le) Received: (from thz@localhost) by mezcal.tue.le (8.12.3/8.12.3/Submit) id g6GDgNf9072665; Tue, 16 Jul 2002 15:42:23 +0200 (CEST) (envelope-from thz) Message-Id: <200207161342.g6GDgNf9072665@mezcal.tue.le> Date: Tue, 16 Jul 2002 15:42:23 +0200 (CEST) From: Thomas Zenker Reply-To: Thomas Zenker To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: bin/40654: patch: sysinstall: infinite loop Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 40654 >Category: bin >Synopsis: patch: sysinstall: infinite loop >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Jul 16 07:00:03 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Thomas Zenker >Release: FreeBSD 4.6-RELEASE i386 >Organization: >Environment: System: FreeBSD mezcal.tue.le 4.6-RELEASE FreeBSD 4.6-RELEASE #8: Mon Jun 10 11:22:51 CEST 2002 thz@mezcal.tue.le:/usr/obj/usr/src/sys/MEZCAL i386 all versions of sysinstall >Description: some errors during scripted partitioning (partionEditor) get sysinstall looping infinitely, because of use of continue vs. break in case of error. >How-To-Repeat: >Fix: the following patch applies to current and stable. Index: label.c =================================================================== RCS file: /usr/cvs/FreeBSD/src/usr.sbin/sysinstall/label.c,v retrieving revision 1.118 diff -u -r1.118 label.c --- label.c 7 Jun 2002 15:32:05 -0000 1.118 +++ label.c 16 Jul 2002 13:27:06 -0000 @@ -1401,7 +1401,7 @@ if (sscanf(cp, "%s %d %s %d", typ, &sz, mpoint, &soft) < 3) { msgConfirm("For slice entry %s, got an invalid detail entry of: %s", c1->name, cp); status = DITEM_FAILURE; - continue; + break; } else { Chunk *tmp; @@ -1422,7 +1422,7 @@ if (sz > space_free(c1)) { msgConfirm("Not enough free space to create partition: %s", mpoint); status = DITEM_FAILURE; - continue; + break; } if (!(tmp = Create_Chunk_DWIM(d, c1, sz, part, (type == PART_SWAP) ? FS_SWAP : FS_BSDFFS, flags))) { >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message