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

Eliminate assert()'s from rpmdsMerge() 

- These "can't happen" cases where EVR/Flags in source ds are missing
  are just as easy to handle as is dying, handling is saner...
This commit is contained in:
Panu Matilainen 2012-09-11 11:19:23 +03:00
parent c5b6ad0464
commit b89a836829
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/rpmds.c
View File

@ -550,12 +550,19 @@ int rpmdsMerge(rpmds * dsp, rpmds ods)
if (ds == NULL)
return -1;
/* Ensure EVR and Flags exist */
if (ds->EVR == NULL)
ds->EVR = xcalloc(ds->Count, sizeof(*ds->EVR));
if (ds->Flags == NULL)
ds->Flags = xcalloc(ds->Count, sizeof(*ds->Flags));
/*
* Add new entries.
*/
save = ods->i;
ods = rpmdsInit(ods);
while (rpmdsNext(ods) >= 0) {
const char *OEVR;
/*
* If this entry is already present, don't bother.
*/
@ -573,16 +580,13 @@ int rpmdsMerge(rpmds * dsp, rpmds ods)
}
ds->N[ds->u] = rpmstrPoolId(ds->pool, rpmdsN(ods), 1);
/* XXX rpm prior to 3.0.2 did not always supply EVR and Flags. */
assert(ods->EVR != NULL);
assert(ods->Flags != NULL);
ds->EVR = xrealloc(ds->EVR, (ds->Count+1) * sizeof(*ds->EVR));
if (ds->u < ds->Count) {
memmove(ds->EVR + ds->u + 1, ds->EVR + ds->u,
(ds->Count - ds->u) * sizeof(*ds->EVR));
}
ds->EVR[ds->u] = rpmstrPoolId(ds->pool, rpmdsEVR(ods), 1);
OEVR = rpmdsEVR(ods);
ds->EVR[ds->u] = rpmstrPoolId(ds->pool, OEVR ? OEVR : "", 1);
ds->Flags = xrealloc(ds->Flags, (ds->Count+1) * sizeof(*ds->Flags));
if (ds->u < ds->Count) {