diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | rpmdb/rpmdb.c | 2 | ||||
| -rw-r--r-- | rpmio/Makefile.am | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -220,6 +220,7 @@ - python: add exception to detect bad data in hdrUnload. - change dir creation message from warning to debug for now. - verify perms (but not mode) on %ghost files. + - headers without RPMTAG_NAME are skipped when retrieved. 4.0 -> 4.0.[12] - add doxygen and lclint annotations most everywhere. diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 9171604bc..a38c58de2 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -1982,7 +1982,7 @@ if (dbi->dbi_api == 1 && dbi->dbi_rpmtag == RPMDBI_PACKAGES && rc == EFAULT) { if (dbi->dbi_api == 1) uh = _free(uh); /* Did the header load correctly? */ - if (mi->mi_h == NULL) { + if (mi->mi_h == NULL || !headerIsEntry(mi->mi_h, RPMTAG_NAME)) { rpmError(RPMERR_BADHEADER, _("rpmdb: damaged header instance #%u retrieved, skipping.\n"), mi->mi_offset); diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 2a31baa09..fe98077f1 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign -EXTRA = tdigest.c tficl.c tkey.c trpmio.c +EXTRA_DIST = tdigest.c tficl.c tkey.c trpmio.c INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/lib \ -I$(top_srcdir)/popt @INCPATH@ |