upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 09:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

getdiskbyname(): plug resource leak

Browse source 
Variable cq going out of scope leaks the storage it points to.

CID:		270511
Phabric:	D1775
Reviewed by:	imp
Obtained from:	NetBSD (CVS rev. 1.34)
MFC after:	2 weeks
This commit is contained in:
Pedro F. Giffuni 2015-02-05 22:54:31 +00:00
parent 94f0eafcd2
commit 5262b957d4
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/libc/gen/disklabel.c
View file

@ -85,10 +85,13 @@ getdiskbyname(const char *name)
cq++, cp++;
*cq = '\0';
if (cgetstr(buf, "ty", &cq) > 0 && strcmp(cq, "removable") == 0)
dp->d_flags |= D_REMOVABLE;
else if (cq && strcmp(cq, "simulated") == 0)
dp->d_flags |= D_RAMDISK;
if (cgetstr(buf, "ty", &cq) > 0) {
if (strcmp(cq, "removable") == 0)
dp->d_flags |= D_REMOVABLE;
else if (cq && strcmp(cq, "simulated") == 0)
dp->d_flags |= D_RAMDISK;
free(cq);
}
if (cgetcap(buf, "sf", ':') != NULL)
dp->d_flags |= D_BADSECT;
@ -100,9 +103,10 @@ getdiskbyname(const char *name)
getnumdflt(dp->d_nsectors, "ns", 0);
getnumdflt(dp->d_ncylinders, "nc", 0);
if (cgetstr(buf, "dt", &cq) > 0)
if (cgetstr(buf, "dt", &cq) > 0) {
dp->d_type = gettype(cq, dktypenames);
else
free(cq);
} else
getnumdflt(dp->d_type, "dt", 0);
getnumdflt(dp->d_secpercyl, "sc", dp->d_nsectors * dp->d_ntracks);
getnumdflt(dp->d_secperunit, "su", dp->d_secpercyl * dp->d_ncylinders);
@ -140,8 +144,11 @@ getdiskbyname(const char *name)
pp->p_frag = 8;
}
getnumdflt(pp->p_fstype, ptype, 0);
if (pp->p_fstype == 0 && cgetstr(buf, ptype, &cq) > 0)
pp->p_fstype = gettype(cq, fstypenames);
if (pp->p_fstype == 0)
if (cgetstr(buf, ptype, &cq) >= 0) {
pp->p_fstype = gettype(cq, fstypenames);
free(cq);
}
max = p;
}
}
@ -155,5 +162,6 @@ getdiskbyname(const char *name)
dp->d_magic = DISKMAGIC;
dp->d_magic2 = DISKMAGIC;
free(buf);
(void)cgetclose();
return (dp);
}