summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2020-05-07 13:28:24 +0300
committerTimo Teräs <timo.teras@iki.fi>2020-05-07 13:28:24 +0300
commit7b76182f39c4b42f4bb498b7cc75384a36afd855 (patch)
treec3188a9928398cce9b5ee5634018daffdf821fcc /src
parent5d796b567819ce91740fcdea7cbafecbda65d8f3 (diff)
downloadapk-tools-7b76182f39c4b42f4bb498b7cc75384a36afd855.tar.gz
apk-tools-7b76182f39c4b42f4bb498b7cc75384a36afd855.tar.bz2
apk-tools-7b76182f39c4b42f4bb498b7cc75384a36afd855.tar.xz
apk-tools-7b76182f39c4b42f4bb498b7cc75384a36afd855.zip
fix apk_blob_pull_csum to always initialize apk_checksum
Fixes #10686 to not use uninitialized value in the error paths.
Diffstat (limited to 'src')
-rw-r--r--src/blob.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/blob.c b/src/blob.c
index fdcd1d1..72b9fd6 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -468,18 +468,14 @@ void apk_blob_pull_csum(apk_blob_t *b, struct apk_checksum *csum)
{
int encoding;
- if (unlikely(APK_BLOB_IS_NULL(*b)))
- return;
-
- if (unlikely(b->len < 2)) {
- *b = APK_BLOB_NULL;
- return;
- }
+ if (unlikely(APK_BLOB_IS_NULL(*b))) goto fail;
+ if (unlikely(b->len < 2)) goto fail;
if (dx(b->ptr[0]) != 0xff) {
/* Assume MD5 for backwards compatibility */
csum->type = APK_CHECKSUM_MD5;
apk_blob_pull_hexdump(b, APK_BLOB_CSUM(*csum));
+ if (unlikely(APK_BLOB_IS_NULL(*b))) goto fail;
return;
}
@@ -489,8 +485,7 @@ void apk_blob_pull_csum(apk_blob_t *b, struct apk_checksum *csum)
csum->type = APK_CHECKSUM_SHA1;
break;
default:
- *b = APK_BLOB_NULL;
- return;
+ goto fail;
}
b->ptr += 2;
b->len -= 2;
@@ -503,7 +498,9 @@ void apk_blob_pull_csum(apk_blob_t *b, struct apk_checksum *csum)
apk_blob_pull_base64(b, APK_BLOB_CSUM(*csum));
break;
default:
+ fail:
*b = APK_BLOB_NULL;
+ csum->type = APK_CHECKSUM_NONE;
break;
}
}