Module Name: src
Committed By: martin
Date: Mon Jun 17 17:53:41 UTC 2019
Modified Files:
src/usr.sbin/sysinst: partman.c
Log Message:
Avoid variable length local array
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/sysinst/partman.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.32 src/usr.sbin/sysinst/partman.c:1.33
--- src/usr.sbin/sysinst/partman.c:1.32 Wed Jun 12 06:20:18 2019
+++ src/usr.sbin/sysinst/partman.c Mon Jun 17 17:53:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.32 2019/06/12 06:20:18 martin Exp $ */
+/* $NetBSD: partman.c,v 1.33 2019/06/17 17:53:41 martin Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -292,6 +292,7 @@ pm_edit(int menu_entries_count, void (*m
void *dev_ptr, int dev_ptr_delta, structinfo_t *s)
{
int i, ok = 0;
+ menu_ent *menu_entries;
if (dev_ptr == NULL) {
/* We should create new device */
@@ -308,7 +309,7 @@ pm_edit(int menu_entries_count, void (*m
}
}
- menu_ent menu_entries[menu_entries_count];
+ menu_entries = calloc(menu_entries_count, sizeof *menu_entries);
for (i = 0; i < menu_entries_count - 1; i++)
menu_entries[i] = (menu_ent) { .opt_menu=OPT_NOMENU,
.opt_action=action };
@@ -324,6 +325,7 @@ pm_edit(int menu_entries_count, void (*m
process_menu(menu_no, dev_ptr);
free_menu(menu_no);
+ free(menu_entries);
return check_fun(dev_ptr);
}
