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

Ensure that a trigger condition actually exists. 

All this time rpm has merrily accepted a trigger with no condition
at all, eg "%triggerin --". Doh. Check and error out on missing trigger.
This is all ridiculously subtle and fragile - pay attention to splitting
the line only after all error messages have been done for full error
message, but since we're now moving s further on whitespace we need
to store the separation point into another helper to avoid breaking
the other %trigger line semantics.
This commit is contained in:
Panu Matilainen 2016-11-11 12:59:50 +02:00
parent 8fc3a220b3
commit dd7af7ed6e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/parseScript.c
View File

@ -15,6 +15,7 @@
#include "debug.h"
#define SKIPSPACE(s) { while (*(s) && risspace(*(s))) (s)++; }
/**
*/
@ -251,7 +252,7 @@ int parseScript(rpmSpec spec, int parsePart)
if (tag == RPMTAG_TRIGGERSCRIPTS || tag == RPMTAG_FILETRIGGERSCRIPTS ||
tag == RPMTAG_TRANSFILETRIGGERSCRIPTS) {
/* break line into two at the -- separator */
char *s = spec->line;
char *sep, *s = spec->line;
while ((s = strstr(s, "--")) != NULL) {
s += 2;
if (risblank(*(s-3)) && risblank(*s))
@ -264,7 +265,15 @@ int parseScript(rpmSpec spec, int parsePart)
goto exit;
}
*(s-3) = '\0';
sep = s;
SKIPSPACE(s);
if (*s == '\0') {
rpmlog(RPMLOG_ERR, _("line %d: missing trigger condition: %s\n"),
spec->lineNum, spec->line);
goto exit;
}
*sep = '\0';
reqargs = xstrdup(s);
}