d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix null dereference if config variable not set.

Browse Source
This commit is contained in:
Paul Traina 1997-05-10 17:11:24 +00:00
parent 0160dedc65
commit fae279d847
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=25665
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/sysinstall/disks.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: disks.c,v 1.83 1997/04/20 16:46:27 jkh Exp $
* $Id: disks.c,v 1.84 1997/05/05 05:16:00 pst Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -248,13 +248,13 @@ diskPartition(Device *dev, Disk *d)
case 'A':
cp = variable_get(VAR_DEDICATE_DISK);
if (!strcasecmp(cp, "always"))
if (cp && !strcasecmp(cp, "always"))
rv = 1;
else {
rv = msgYesNo("Do you want to do this with a true partition entry\n"
"so as to remain cooperative with any future possible\n"
"operating systems on the drive(s)?");
if (rv != 0 && strcasecmp(cp, "nowarn")) {
if (rv != 0 && (!cp || strcasecmp(cp, "nowarn"))) {
rv = !msgYesNo("This is dangerous in that it will make the drive totally\n"
"uncooperative with other potential operating systems on the\n"
"same disk. It will lead instead to a totally dedicated disk,\n"

6
usr.sbin/sade/disks.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: disks.c,v 1.83 1997/04/20 16:46:27 jkh Exp $
* $Id: disks.c,v 1.84 1997/05/05 05:16:00 pst Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -248,13 +248,13 @@ diskPartition(Device *dev, Disk *d)
case 'A':
cp = variable_get(VAR_DEDICATE_DISK);
if (!strcasecmp(cp, "always"))
if (cp && !strcasecmp(cp, "always"))
rv = 1;
else {
rv = msgYesNo("Do you want to do this with a true partition entry\n"
"so as to remain cooperative with any future possible\n"
"operating systems on the drive(s)?");
if (rv != 0 && strcasecmp(cp, "nowarn")) {
if (rv != 0 && (!cp || strcasecmp(cp, "nowarn"))) {
rv = !msgYesNo("This is dangerous in that it will make the drive totally\n"
"uncooperative with other potential operating systems on the\n"
"same disk. It will lead instead to a totally dedicated disk,\n"

6
usr.sbin/sysinstall/disks.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: disks.c,v 1.83 1997/04/20 16:46:27 jkh Exp $
* $Id: disks.c,v 1.84 1997/05/05 05:16:00 pst Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -248,13 +248,13 @@ diskPartition(Device *dev, Disk *d)
case 'A':
cp = variable_get(VAR_DEDICATE_DISK);
if (!strcasecmp(cp, "always"))
if (cp && !strcasecmp(cp, "always"))
rv = 1;
else {
rv = msgYesNo("Do you want to do this with a true partition entry\n"
"so as to remain cooperative with any future possible\n"
"operating systems on the drive(s)?");
if (rv != 0 && strcasecmp(cp, "nowarn")) {
if (rv != 0 && (!cp || strcasecmp(cp, "nowarn"))) {
rv = !msgYesNo("This is dangerous in that it will make the drive totally\n"
"uncooperative with other potential operating systems on the\n"
"same disk. It will lead instead to a totally dedicated disk,\n"