Merge pull request #1384 from jan-cerny/rpminfo_no_filepaths

matejak · web-flow · commit 7627132512c4 · 2019-07-24T10:16:10.000+02:00
Fix missing filepaths in rpminfo items
diff --git a/src/OVAL/probes/unix/linux/rpminfo.c b/src/OVAL/probes/unix/linux/rpminfo.c
@@ -339,7 +339,8 @@ static int collect_rpm_files(SEXP_t *item, const struct rpminfo_rep *rep) {
 		ret = -1;
 		goto cleanup;
 	}
-	if (rpmdbSetIteratorRE(ts, RPMTAG_EPOCH, RPMMIRE_STRCMP, rep->epoch) != 0) {
+	char *epoch_override = oscap_streq(rep->epoch, "(none)") ? "0" : rep->epoch;
+	if (rpmdbSetIteratorRE(ts, RPMTAG_EPOCH, RPMMIRE_STRCMP, epoch_override) != 0) {
 		ret = -1;
 		goto cleanup;
 	}

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,8 @@ static int collect_rpm_files(SEXP_t item, const struct rpminfo_rep rep) {`
`339`	`339`	`ret = -1;`
`340`	`340`	`goto cleanup;`
`341`	`341`	`}`
`342`		`- if (rpmdbSetIteratorRE(ts, RPMTAG_EPOCH, RPMMIRE_STRCMP, rep->epoch) != 0) {`
	`342`	`+ char *epoch_override = oscap_streq(rep->epoch, "(none)") ? "0" : rep->epoch;`
	`343`	`+ if (rpmdbSetIteratorRE(ts, RPMTAG_EPOCH, RPMMIRE_STRCMP, epoch_override) != 0) {`
`343`	`344`	`ret = -1;`
`344`	`345`	`goto cleanup;`
`345`	`346`	`}`