[src/trunk]: src/usr.sbin/sysinst PR 55572: avoid crash when answering the mo...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4415438676f0
branches:  trunk
changeset: 974858:4415438676f0
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Aug 14 08:46:54 2020 +0000

description:
PR 55572: avoid crash when answering the mount point prompt for a previously
empty mount point with an emptry sting.

diffstat:

 usr.sbin/sysinst/label.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r ab27f9897b6c -r 4415438676f0 usr.sbin/sysinst/label.c
--- a/usr.sbin/sysinst/label.c  Fri Aug 14 08:19:26 2020 +0000
+++ b/usr.sbin/sysinst/label.c  Fri Aug 14 08:46:54 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: label.c,v 1.20 2020/01/27 21:21:22 martin Exp $        */
+/*     $NetBSD: label.c,v 1.21 2020/08/14 08:46:54 martin Exp $        */
 
 /*
  * Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.20 2020/01/27 21:21:22 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.21 2020/08/14 08:46:54 martin Exp $");
 #endif
 
 #include <sys/types.h>
@@ -356,7 +356,7 @@
        if (last != NULL)
                last[1] = 0;
 
-       if (*first == 0 || strcmp(first, "none") == 0) {
+       if (first == NULL || *first == 0 || strcmp(first, "none") == 0) {
                edit->wanted->mount[0] = 0;
                edit->wanted->instflags &= ~PUIINST_MOUNT;
                return 0;