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

Fix error handling in rpmDigestBundleAddID() 

Besides the logic being completely wrong to begin with, it wasn't
actually handling the failure to allocate a digest at all. Do that,
and return values according to documentation.
This commit is contained in:
Panu Matilainen 2017-03-29 13:33:46 +03:00
parent 2652bab3e9
commit b8b5cdb09f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpmio/digest.c
View File

@ -60,17 +60,20 @@ int rpmDigestBundleAdd(rpmDigestBundle bundle, int algo,
int rpmDigestBundleAddID(rpmDigestBundle bundle, int algo, int id,
rpmDigestFlags flags)
{
DIGEST_CTX ctx = NULL;
int rc = -1;
if (id > 0 && findID(bundle, id) < 0) {
int ix = findID(bundle, 0); /* Find first free slot */
if (ix >= 0) {
bundle->digests[ix] = rpmDigestInit(algo, flags);
bundle->ids[ix]= id;
if (ix > bundle->index_max)
bundle->index_max = ix;
if (bundle->digests[ix]) {
bundle->ids[ix]= id;
if (ix > bundle->index_max)
bundle->index_max = ix;
rc = 0;
}
}
}
return (ctx != NULL);
return rc;
}
int rpmDigestBundleUpdate(rpmDigestBundle bundle, const void *data, size_t len)
{