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

mkpkg: check apk_ostream_to_file/adb_compress error 

fixes #10823
cute-signatures
Timo Teräs 2022-03-06 16:15:53 +02:00
parent 00e397d564
commit b5da1ccf4c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app_mkpkg.c
View File

@ -316,6 +316,11 @@ static int mkpkg_main(void *pctx, struct apk_ctx *ac, struct apk_string_array *a
// construct package with ADB as header, and the file data in // construct package with ADB as header, and the file data in
// concatenated data blocks // concatenated data blocks
os = adb_compress(apk_ostream_to_file(AT_FDCWD, ctx->output, 0644), ADB_COMP_DEFLATE); os = adb_compress(apk_ostream_to_file(AT_FDCWD, ctx->output, 0644), ADB_COMP_DEFLATE);
if (IS_ERR(os)) {
r = PTR_ERR(os);
goto err;
}
adb_c_adb(os, &ctx->db, trust); adb_c_adb(os, &ctx->db, trust);
int files_fd = openat(AT_FDCWD, ctx->files_dir, O_RDONLY); int files_fd = openat(AT_FDCWD, ctx->files_dir, O_RDONLY);
for (i = ADBI_FIRST; i <= adb_ra_num(&ctx->paths); i++) { for (i = ADBI_FIRST; i <= adb_ra_num(&ctx->paths); i++) {
@ -350,7 +355,7 @@ static int mkpkg_main(void *pctx, struct apk_ctx *ac, struct apk_string_array *a
err: err:
adb_free(&ctx->db); adb_free(&ctx->db);
if (r) apk_err(out, "failed to create package: %s", apk_error_str(r)); if (r) apk_err(out, "failed to create package: %s: %s", ctx->output, apk_error_str(r));
return r; return r;
} }