[src/netbsd-9]: src/usr.sbin/sysinst Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/1d476cc73147
branches:  netbsd-9
changeset: 962833:1d476cc73147
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Aug 18 13:17:39 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #76):
        usr.sbin/sysinst/partman.c: revision 1.42
Make sure to completely initialize dynamic menu entries.

diffstat:

 usr.sbin/sysinst/partman.c |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (39 lines):

diff -r f2f0a0907361 -r 1d476cc73147 usr.sbin/sysinst/partman.c
--- a/usr.sbin/sysinst/partman.c        Sun Aug 18 13:14:26 2019 +0000
+++ b/usr.sbin/sysinst/partman.c        Sun Aug 18 13:17:39 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: partman.c,v 1.41 2019/07/25 19:01:08 martin Exp $ */
+/*     $NetBSD: partman.c,v 1.41.2.1 2019/08/18 13:17:39 msaitoh Exp $ */
 
 /*
  * Copyright 2012 Eugene Lozovoy
@@ -2802,8 +2802,7 @@
                return -1;
 
        SLIST_FOREACH(pm_i, &pm_head, l) {
-               m->opts[i].opt_name = NULL;
-               m->opts[i].opt_exp_name = NULL;
+               memset(&m->opts[i], 0, sizeof m->opts[i]);
                m->opts[i].opt_action = pm_submenu;
                ((struct part_entry *)arg)[i].dev_ptr = pm_i;
                ((struct part_entry *)arg)[i].id = NO_PART;
@@ -2837,8 +2836,7 @@
                                if (i >= MAX_ENTRIES)
                                        break;
                                i++;
-                               m->opts[i].opt_name = NULL;
-                               m->opts[i].opt_exp_name = NULL;
+                               memset(&m->opts[i], 0, sizeof m->opts[i]);
                                m->opts[i].opt_action = pm_submenu;
                                ((struct part_entry *)arg)[i].parts =
                                    pm_i->parts;
@@ -2860,8 +2858,7 @@
                                if (i >= MAX_ENTRIES)
                                        break;
                                i++;
-                               m->opts[i].opt_name = NULL;
-                               m->opts[i].opt_exp_name = NULL;
+                               memset(&m->opts[i], 0, sizeof m->opts[i]);
                                m->opts[i].opt_action = pm_submenu;
                                ((struct part_entry *)arg)[i].parts = secondary;
                                ((struct part_entry *)arg)[i].dev_ptr = pm_i;