From 9d7b4bd25314dd4c726106e6573d20a34ee2e70d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Thu, 11 Nov 2021 11:21:04 +0200 Subject: [PATCH] extract_v3: fix extraction of zero length files The apk_istream is null for zero length files, and needs special handling. fixes #10784 --- src/extract_v3.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/extract_v3.c b/src/extract_v3.c index c25b2ae..65e8a59 100644 --- a/src/extract_v3.c +++ b/src/extract_v3.c @@ -77,10 +77,11 @@ static int apk_extract_v3_file(struct apk_extract_ctx *ectx, off_t sz, struct ap return ectx->ops->file(ectx, &fi, is); } + fi.mode |= S_IFREG; + if (!is) return ectx->ops->file(ectx, &fi, 0); + apk_digest_from_blob(&fi.digest, adb_ro_blob(&ctx->file, ADBI_FI_HASHES)); if (fi.digest.alg == APK_DIGEST_NONE) return -APKE_ADB_SCHEMA; - - fi.mode |= S_IFREG; r = ectx->ops->file(ectx, &fi, apk_istream_verify(&dis, is, fi.size, &fi.digest)); return apk_istream_close_error(&dis.is, r); }