nortti/sortix-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix sysmerge(8) use-after-free in /etc/machine error path.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2024-08-21 16:39:05 +02:00
parent 2bf97e0439
commit 6fe494365e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sysinstall/sysmerge.c
View file

@ -288,7 +288,6 @@ int main(int argc, char* argv[])
char* old_machine = read_string_file(old_machine_path);
if ( !old_machine )
err(2, "%s", old_machine_path);
free(old_machine_path);
char* new_machine_path = join_paths(source, "etc/machine");
if ( !new_machine_path )
err(2, "malloc");
@ -300,8 +299,9 @@ int main(int argc, char* argv[])
errx(2, "%s (%s) does not match %s (%s)", new_machine_path,
new_machine, old_machine_path, old_machine);
free(old_machine);
free(new_machine_path);
free(old_machine_path);
free(new_machine);
free(new_machine_path);
}
// TODO: Check for version (skipping, downgrading).