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

Fix memory leak/double free found by phkmalloc

Browse Source 
Uniform mboot.bootinst allocation code to be independent of functions order
This commit is contained in:
Andrey A. Chernov 2000-07-15 13:37:47 +00:00
parent fc80937e0b
commit 2b5ce8a961
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/fdisk/fdisk.c
View File

@ -299,10 +299,11 @@ main(int argc, char *argv[])
} }
/* (abu)use mboot.bootinst to probe for the sector size */ /* (abu)use mboot.bootinst to probe for the sector size */
if (mboot.bootinst != NULL)
free(mboot.bootinst);
if ((mboot.bootinst = malloc(MAX_SEC_SIZE)) == NULL) if ((mboot.bootinst = malloc(MAX_SEC_SIZE)) == NULL)
err(1, "cannot allocate buffer to determine disk sector size"); err(1, "cannot allocate buffer to determine disk sector size");
read_disk(0, mboot.bootinst); read_disk(0, mboot.bootinst);
free(mboot.bootinst);
if (s_flag) if (s_flag)
{ {
@ -494,6 +495,8 @@ init_boot(void)
err(1, "%s", fname); err(1, "%s", fname);
if ((mboot.bootinst_size = sb.st_size) % secsize != 0) if ((mboot.bootinst_size = sb.st_size) % secsize != 0)
errx(1, "%s: length must be a multiple of sector size", fname); errx(1, "%s: length must be a multiple of sector size", fname);
if (mboot.bootinst != NULL)
free(mboot.bootinst);
if ((mboot.bootinst = malloc(mboot.bootinst_size = sb.st_size)) == NULL) if ((mboot.bootinst = malloc(mboot.bootinst_size = sb.st_size)) == NULL)
errx(1, "%s: unable to allocate read buffer", fname); errx(1, "%s: unable to allocate read buffer", fname);
if ((n = read(fd, mboot.bootinst, mboot.bootinst_size)) == -1 || if ((n = read(fd, mboot.bootinst, mboot.bootinst_size)) == -1 ||
@ -779,15 +782,14 @@ get_params()
static int static int
read_s0() read_s0()
{ {
if (mboot.bootinst != NULL) {
free(mboot.bootinst);
mboot.bootinst_size = secsize; mboot.bootinst_size = secsize;
if (mboot.bootinst != NULL)
free(mboot.bootinst);
if ((mboot.bootinst = malloc(mboot.bootinst_size)) == NULL) { if ((mboot.bootinst = malloc(mboot.bootinst_size)) == NULL) {
warnx("unable to allocate buffer to read fdisk " warnx("unable to allocate buffer to read fdisk "
"partition table"); "partition table");
return -1; return -1;
} }
}
if (read_disk(0, mboot.bootinst) == -1) { if (read_disk(0, mboot.bootinst) == -1) {
warnx("can't read fdisk partition table"); warnx("can't read fdisk partition table");
return -1; return -1;

10
sbin/i386/fdisk/fdisk.c
View File

@ -299,10 +299,11 @@ main(int argc, char *argv[])
} }
/* (abu)use mboot.bootinst to probe for the sector size */ /* (abu)use mboot.bootinst to probe for the sector size */
if (mboot.bootinst != NULL)
free(mboot.bootinst);
if ((mboot.bootinst = malloc(MAX_SEC_SIZE)) == NULL) if ((mboot.bootinst = malloc(MAX_SEC_SIZE)) == NULL)
err(1, "cannot allocate buffer to determine disk sector size"); err(1, "cannot allocate buffer to determine disk sector size");
read_disk(0, mboot.bootinst); read_disk(0, mboot.bootinst);
free(mboot.bootinst);
if (s_flag) if (s_flag)
{ {
@ -494,6 +495,8 @@ init_boot(void)
err(1, "%s", fname); err(1, "%s", fname);
if ((mboot.bootinst_size = sb.st_size) % secsize != 0) if ((mboot.bootinst_size = sb.st_size) % secsize != 0)
errx(1, "%s: length must be a multiple of sector size", fname); errx(1, "%s: length must be a multiple of sector size", fname);
if (mboot.bootinst != NULL)
free(mboot.bootinst);
if ((mboot.bootinst = malloc(mboot.bootinst_size = sb.st_size)) == NULL) if ((mboot.bootinst = malloc(mboot.bootinst_size = sb.st_size)) == NULL)
errx(1, "%s: unable to allocate read buffer", fname); errx(1, "%s: unable to allocate read buffer", fname);
if ((n = read(fd, mboot.bootinst, mboot.bootinst_size)) == -1 || if ((n = read(fd, mboot.bootinst, mboot.bootinst_size)) == -1 ||
@ -779,15 +782,14 @@ get_params()
static int static int
read_s0() read_s0()
{ {
if (mboot.bootinst != NULL) {
free(mboot.bootinst);
mboot.bootinst_size = secsize; mboot.bootinst_size = secsize;
if (mboot.bootinst != NULL)
free(mboot.bootinst);
if ((mboot.bootinst = malloc(mboot.bootinst_size)) == NULL) { if ((mboot.bootinst = malloc(mboot.bootinst_size)) == NULL) {
warnx("unable to allocate buffer to read fdisk " warnx("unable to allocate buffer to read fdisk "
"partition table"); "partition table");
return -1; return -1;
} }
}
if (read_disk(0, mboot.bootinst) == -1) { if (read_disk(0, mboot.bootinst) == -1) {
warnx("can't read fdisk partition table"); warnx("can't read fdisk partition table");
return -1; return -1;