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

Further sanity check for EVR validity on build 

- Check for multiple ':' and '-'  separators (eg foo >= 1-1-1)
  which is not valid. Based on James Antill's patch on rpm-maint
  (http://lists.rpm.org/pipermail/rpm-maint/2013-November/003640.html)
  but modified to avoid bogus spec line numbers on invalid
  autogenerated dependencies.
This commit is contained in:
Panu Matilainen 2013-11-20 15:40:31 +02:00
parent 48563caa6a
commit b2cf1471bb
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/parseReqs.c
View File

@ -35,6 +35,16 @@ const char * token;
#define SKIPWHITE(_x) {while(*(_x) && (risspace(*_x) || *(_x) == ',')) (_x)++;}
#define SKIPNONWHITE(_x){while(*(_x) &&!(risspace(*_x) || *(_x) == ',')) (_x)++;}
static int checkSep(const char *s, char c, char **emsg)
{
const char *sep = strchr(s, c);
if (sep && strchr(sep + 1, c)) {
rasprintf(emsg, "Double separator '%c' in: %s", c, s);
return 1;
}
return 0;
}
rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTagVal tagN,
int index, rpmsenseFlags tagflags)
{
@ -154,6 +164,11 @@ rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTagVal tagN,
EVR = xmalloc((ve-v) + 1);
rstrlcpy(EVR, v, (ve-v) + 1);
if (rpmCharCheck(spec, EVR, ve-v, ".-_+:%{}~")) goto exit;
/* While ':' and '-' are valid, only one of each is valid. */
if (checkSep(EVR, '-', &emsg) || checkSep(EVR, ':', &emsg))
goto exit;
re = ve; /* ==> next token after EVR string starts here */
} else
EVR = NULL;