From 2a25a595ce90e95edd2a4127a8c7f320d94ddaaf Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Thu, 15 Jul 2021 16:37:26 +0300 Subject: check trust in adb_trust_write_signatures() Based on patch from Daniel Golle --- src/adb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/adb.c b/src/adb.c index a7401a0..77ceb63 100644 --- a/src/adb.c +++ b/src/adb.c @@ -973,7 +973,7 @@ int adb_c_adb(struct apk_ostream *os, struct adb *db, struct apk_trust *t) adb_c_header(os, db); adb_c_block(os, ADB_BLOCK_ADB, db->adb); - if (t) adb_trust_write_signatures(t, db, NULL, os); + adb_trust_write_signatures(t, db, NULL, os); return apk_ostream_error(os); } @@ -1032,6 +1032,8 @@ int adb_trust_write_signatures(struct apk_trust *trust, struct adb *db, struct a size_t siglen; int r; + if (IS_ERR_OR_NULL(trust)) return PTR_ERR(trust); + if (!vfy) { vfy = alloca(sizeof *vfy); memset(vfy, 0, sizeof *vfy); -- cgit v1.2.3-70-g09d2