folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix memleak in changelog parsing on error paths 

- All the early returns would leak memory from the argvJoin(),
  assume failure and force all exits through a single path where
  we can clean up.
This commit is contained in:
Panu Matilainen 2012-08-01 19:17:09 +03:00
parent 465f5f9d5c
commit 395be24637
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build/parseChangelog.c
View File

@ -128,6 +128,7 @@ exit:
*/
static rpmRC addChangelog(Header h, ARGV_const_t sb)
{
rpmRC rc = RPMRC_FAIL; /* assume failure */
char *s, *sp;
int i;
time_t time;
@ -142,9 +143,8 @@ static rpmRC addChangelog(Header h, ARGV_const_t sb)
while (*s != '\0') {
if (*s != '*') {
rpmlog(RPMLOG_ERR,
_("%%changelog entries must start with *\n"));
return RPMRC_FAIL;
rpmlog(RPMLOG_ERR, _("%%changelog entries must start with *\n"));
goto exit;
}
/* find end of line */
@ -152,7 +152,7 @@ static rpmRC addChangelog(Header h, ARGV_const_t sb)
while(*s && *s != '\n') s++;
if (! *s) {
rpmlog(RPMLOG_ERR, _("incomplete %%changelog entry\n"));
return RPMRC_FAIL;
goto exit;
}
*s = '\0';
text = s + 1;
@ -167,12 +167,12 @@ static rpmRC addChangelog(Header h, ARGV_const_t sb)
SKIPSPACE(date);
if (dateToTimet(date, &time)) {
rpmlog(RPMLOG_ERR, _("bad date in %%changelog: %s\n"), date);
return RPMRC_FAIL;
goto exit;
}
if (lastTime && lastTime < time) {
rpmlog(RPMLOG_ERR,
_("%%changelog not in descending chronological order\n"));
return RPMRC_FAIL;
goto exit;
}
lastTime = time;
@ -180,7 +180,7 @@ static rpmRC addChangelog(Header h, ARGV_const_t sb)
SKIPSPACE(s);
if (! *s) {
rpmlog(RPMLOG_ERR, _("missing name in %%changelog\n"));
return RPMRC_FAIL;
goto exit;
}
/* name */
@ -191,14 +191,14 @@ static rpmRC addChangelog(Header h, ARGV_const_t sb)
}
if (s == name) {
rpmlog(RPMLOG_ERR, _("missing name in %%changelog\n"));
return RPMRC_FAIL;
goto exit;
}
/* text */
SKIPSPACE(text);
if (! *text) {
rpmlog(RPMLOG_ERR, _("no description in %%changelog\n"));
return RPMRC_FAIL;
goto exit;
}
/* find the next leading '*' (or eos) */
@ -220,9 +220,12 @@ static rpmRC addChangelog(Header h, ARGV_const_t sb)
s = next;
}
rc = RPMRC_OK;
exit:
free(sp);
return RPMRC_OK;
return rc;
}
int parseChangelog(rpmSpec spec)