From 9929a34aaf1fd4c485c2f8d38be0017d7a610c7e Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 11 Sep 2012 08:05:43 +0300 Subject: [PATCH] Eliminate direct rpmds name (and flags) access on rpmdsNew() --- lib/rpmds.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/rpmds.c b/lib/rpmds.c index 3480373..4000740 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -175,9 +175,11 @@ rpmds rpmdsNew(Header h, rpmTagVal tagN, int flags) /* ensure rpmlib() requires always have RPMSENSE_RPMLIB flag set */ if (tagN == RPMTAG_REQUIRENAME && ds->Flags) { for (int i = 0; i < ds->Count; i++) { - if (!(ds->Flags[i] & RPMSENSE_RPMLIB) && - rstreqn(ds->N[i], "rpmlib(", sizeof("rpmlib(")-1)) - ds->Flags[i] |= RPMSENSE_RPMLIB; + if (!(rpmdsFlagsIndex(ds, i) & RPMSENSE_RPMLIB)) { + const char *N = rpmdsNIndex(ds, i); + if (rstreqn(N, "rpmlib(", sizeof("rpmlib(")-1)) + ds->Flags[i] |= RPMSENSE_RPMLIB; + } } } -- 2.7.4