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

loader: make sure we do not return garbage from help_getnext

Browse Source 
Since we do free subtopic and desc in help_getnext(), we need to set them also
NULL, so we make sure we dont get double free().

Approved by:	bapt
Differential Revision:	https://reviews.freebsd.org/D15082
This commit is contained in:
tsoome 2018-04-16 12:46:14 +00:00
parent 5c07adbdc3
commit 360c32cf1d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stand/common/commands.c
View File

@ -74,7 +74,6 @@ help_getnext(int fd, char **topic, char **subtopic, char **desc)
if ((strlen(line) < 3) || (line[0] != '#') || (line[1] != ' '))
continue;
*topic = *subtopic = *desc = NULL;
cp = line + 2;
while((cp != NULL) && (*cp != 0)) {
ep = strchr(cp, ' ');
@ -95,6 +94,7 @@ help_getnext(int fd, char **topic, char **subtopic, char **desc)
if (*topic == NULL) {
free(*subtopic);
free(*desc);
*subtopic = *desc = NULL;
continue;
}
return(1);