diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2023-02-08 13:36:41 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2023-02-14 11:46:24 +0200 |
| commit | 6720b6d00c45b3fab15697a0dea4e590fa69aafd (patch) | |
| tree | 12d5889668ee14fc46b2aa7ce18ea3cddbf90fbe /lib | |
| parent | 6f384ef55083a00e3667bf91b6bfc3dce04023d4 (diff) | |
| download | rpm-6720b6d00c45b3fab15697a0dea4e590fa69aafd.tar.gz | |
Switch header region index and data lengths to unsigned integers
Or mostly so, anyhow. Take care to check that region size is small enough
to fit in the negative offset. No functional changes intended.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/header.c | 19 | ||||
| -rw-r--r-- | lib/header_internal.h | 4 |
2 files changed, 13 insertions, 10 deletions
diff --git a/lib/header.c b/lib/header.c index 68d54c96b..5ebf33ce3 100644 --- a/lib/header.c +++ b/lib/header.c @@ -623,8 +623,8 @@ static void * doExport(const struct indexEntry_s *hindex, int indexUsed, drlen = ndribbles = 0; for (i = 0, entry = index; i < indexUsed; i++, entry++) { if (ENTRY_IS_REGION(entry)) { - int32_t rdl = -entry->info.offset; /* negative offset */ - int32_t ril = rdl/sizeof(*pe); + uint32_t rdl = -entry->info.offset; /* negative offset */ + uint32_t ril = rdl/sizeof(*pe); int rid = entry->info.offset; il += ril; @@ -695,8 +695,8 @@ static void * doExport(const struct indexEntry_s *hindex, int indexUsed, pe->count = htonl(entry->info.count); if (ENTRY_IS_REGION(entry)) { - int32_t rdl = -entry->info.offset; /* negative offset */ - int32_t ril = rdl/sizeof(*pe) + ndribbles; + uint32_t rdl = -entry->info.offset; /* negative offset */ + uint32_t ril = rdl/sizeof(*pe) + ndribbles; int rid = entry->info.offset; src = (char *)entry->data; @@ -934,13 +934,16 @@ rpmRC hdrblobImport(hdrblob blob, int fast, Header *hdrp, char **emsg) h->indexUsed++; } else { /* Either a v4 header or an "upgraded" v3 header with a legacy region */ - int32_t ril; + uint32_t ril, offset; h->flags &= ~HEADERFLAG_LEGACY; ei2h(blob->pe, &entry->info); ril = (entry->info.offset != 0) ? blob->ril : blob->il; - entry->info.offset = -(ril * sizeof(*blob->pe)); /* negative offset */ + offset = ril * sizeof(*blob->pe); + if (offset >= INT32_MAX) + goto errxit; + entry->info.offset = -offset; /* negative offset */ entry->data = blob->pe; entry->length = blob->pvlen - sizeof(blob->il) - sizeof(blob->dl); rdlen = regionSwab(entry+1, ril-1, 0, blob->pe+1, @@ -1117,8 +1120,8 @@ static int copyTdEntry(const indexEntry entry, rpmtd td, headerGetFlags flags) uint32_t * ei = ((uint32_t *)entry->data) - 2; entryInfo pe = (entryInfo) (ei + 2); unsigned char * dataStart = (unsigned char *) (pe + ntohl(ei[0])); - int32_t rdl = -entry->info.offset; /* negative offset */ - int32_t ril = rdl/sizeof(*pe); + uint32_t rdl = -entry->info.offset; /* negative offset */ + uint32_t ril = rdl/sizeof(*pe); rdl = entry->rdlen; count = 2 * sizeof(*ei) + (ril * sizeof(*pe)) + rdl; diff --git a/lib/header_internal.h b/lib/header_internal.h index efdafe271..03c434349 100644 --- a/lib/header_internal.h +++ b/lib/header_internal.h @@ -29,8 +29,8 @@ struct hdrblob_s { uint8_t *dataEnd; rpmTagVal regionTag; - int32_t ril; - int32_t rdl; + uint32_t ril; + uint32_t rdl; }; #ifdef __cplusplus |