jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

extract_v3: make sure empty file's hash is copied too 

fixes #10785
cute-signatures
Timo Teräs 2021-12-03 15:05:50 +02:00
parent 1ab81fdd4c
commit 8c6c44d3eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/extract_v3.c
View File

@ -77,11 +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); return ectx->ops->file(ectx, &fi, is);
} }
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; fi.mode |= S_IFREG;
if (!is) return ectx->ops->file(ectx, &fi, 0); 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;
r = ectx->ops->file(ectx, &fi, apk_istream_verify(&dis, is, fi.size, &fi.digest)); r = ectx->ops->file(ectx, &fi, apk_istream_verify(&dis, is, fi.size, &fi.digest));
return apk_istream_close_error(&dis.is, r); return apk_istream_close_error(&dis.is, r);
} }