Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some memory leaks in error paths

This commit is contained in:
martin 2019-08-17 18:03:12 +00:00
parent 1b565566ff
commit 31a289cd68
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.sbin/sysinst/install.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: install.c,v 1.9 2019/07/23 18:13:40 martin Exp $ */
/* $NetBSD: install.c,v 1.10 2019/08/17 18:03:12 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -165,7 +165,7 @@ do_install(void)
if (!md_get_info(&install) ||
!md_make_bsd_partitions(&install)) {
hit_enter_to_continue(MSG_abort_inst, NULL);
return;
goto error;
}
/* Last chance ... do you really want to do this? */
@ -173,7 +173,7 @@ do_install(void)
refresh();
msg_fmt_display(MSG_lastchance, "%s", pm->diskdev);
if (!ask_noyes(NULL))
return;
goto error;
/*
* Check if we have a secondary partitioning and
@ -194,19 +194,19 @@ do_install(void)
make_filesystems(&install) ||
make_fstab(&install) != 0 ||
md_post_newfs(&install) != 0)
return;
goto error;
}
/* Unpack the distribution. */
process_menu(MENU_distset, &retcode);
if (retcode == 0)
return;
goto error;
if (get_and_unpack_sets(0, MSG_disksetupdone,
MSG_extractcomplete, MSG_abortinst) != 0)
return;
goto error;
if (md_post_extract(&install) != 0)
return;
goto error;
do_configmenu(&install);
@ -217,4 +217,7 @@ do_install(void)
free(install.infos);
hit_enter_to_continue(MSG_instcomplete, NULL);
error:
free(install.infos);
}

3
usr.sbin/sysinst/util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.30 2019/08/17 17:51:19 martin Exp $ */
/* $NetBSD: util.c,v 1.31 2019/08/17 18:03:12 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -933,6 +933,7 @@ extract_file(distinfo *dist, int update)
1, &dist->name);
hit_enter_to_continue(err, NULL);
free(err);
free(owd);
return SET_RETRY;
}
#ifdef SUPPORT_8_3_SOURCE_FILESYSTEM