d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sanity check the list obtained from the kern.disks sysctl so that Disk_Names()

Browse Source 
doesn't get fooled into returning a bogus list.  This should fix sysinstall
from segfaulting when no disk devices are present.
This commit is contained in:
Scott Long 2003-06-07 20:02:56 +00:00
parent f9b96756eb
commit 4e89f2d88f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libdisk/disk.c
View File

@ -470,6 +470,9 @@ Disk_Names()
return NULL;
}
if (listsize == 0)
return (NULL);
disks = malloc(sizeof *disks * (1 + MAX_NO_DISKS));
if (disks == NULL)
return NULL;
@ -481,7 +484,7 @@ Disk_Names()
memset(disks,0,sizeof *disks * (1 + MAX_NO_DISKS));
memset(disklist, 0, listsize + 1);
error = sysctlbyname("kern.disks", disklist, &listsize, NULL, 0);
if (error) {
if (error || disklist[0] == 0) {
free(disklist);
free(disks);
return NULL;