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

Drop fsize parameter from rpmCharCheck() 

Everybody calls it with the length of the string and the
strstr it uses ignores the fsize parameter anyway.
This commit is contained in:
Michael Schroeder 2014-09-11 13:53:16 +02:00
parent 622e066153
commit 9b44c75811
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/parsePreamble.c
View File

@ -602,15 +602,14 @@ if (multiToken) { \
* Check for inappropriate characters. All alphanums are considered sane.
* @param spec spec
* @param field string to check
* @param fsize size of string to check
* @param whitelist string of permitted characters
* @return RPMRC_OK if OK
*/
rpmRC rpmCharCheck(rpmSpec spec, const char *field, size_t fsize, const char *whitelist)
rpmRC rpmCharCheck(rpmSpec spec, const char *field, const char *whitelist)
{
const char *ch, *stop = &field[fsize];
const char *ch;
for (ch=field; *ch && ch < stop; ch++) {
for (ch=field; *ch; ch++) {
if (risalnum(*ch) || strchr(whitelist, *ch)) continue;
if (isprint(*ch)) {
rpmlog(RPMLOG_ERR, _("line %d: Illegal char '%c' in: %s\n"),
@ -731,7 +730,7 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag,
switch (tag) {
case RPMTAG_NAME:
SINGLE_TOKEN_ONLY;
if (rpmCharCheck(spec, field, strlen(field), WHITELIST_NAME))
if (rpmCharCheck(spec, field, WHITELIST_NAME))
goto exit;
headerPutString(pkg->header, tag, field);
/* Main pkg name is unknown at the start, populate as soon as we can */
@ -741,7 +740,7 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag,
case RPMTAG_VERSION:
case RPMTAG_RELEASE:
SINGLE_TOKEN_ONLY;
if (rpmCharCheck(spec, field, strlen(field), "._+%{}~"))
if (rpmCharCheck(spec, field, "._+%{}~"))
goto exit;
headerPutString(pkg->header, tag, field);
break;
@ -1048,7 +1047,7 @@ int parsePreamble(rpmSpec spec, int initialPackage)
goto exit;
}
if (rpmCharCheck(spec, name, strlen(name), WHITELIST_NAME))
if (rpmCharCheck(spec, name, WHITELIST_NAME))
goto exit;
if (!lookupPackage(spec, name, flag, NULL)) {

2
build/parseReqs.c
View File

@ -60,7 +60,7 @@ static rpmRC checkDep(rpmSpec spec, char *N, char *EVR, char **emsg)
rasprintf(emsg, _("Versioned file name not permitted"));
return RPMRC_FAIL;
}
if (rpmCharCheck(spec, EVR, strlen(EVR), ".-_+:%{}~"))
if (rpmCharCheck(spec, EVR, ".-_+:%{}~"))
return RPMRC_FAIL;
if (checkSep(EVR, '-', emsg) != RPMRC_OK || checkSep(EVR, ':', emsg) != RPMRC_OK)
return RPMRC_FAIL;

3
build/rpmbuild_internal.h
View File

@ -267,12 +267,11 @@ int parseScript(rpmSpec spec, int parsePart);
* Check for inappropriate characters. All alphanums are considered sane.
* @param spec spec
* @param field string to check
* @param fsize size of string to check
* @param whitelist string of permitted characters
* @return RPMRC_OK if OK
*/
RPM_GNUC_INTERNAL
rpmRC rpmCharCheck(rpmSpec spec, const char *field, size_t fsize, const char *whitelist);
rpmRC rpmCharCheck(rpmSpec spec, const char *field, const char *whitelist);
/** \ingroup rpmbuild
* Parse dependency relations from spec file and/or autogenerated output buffer.