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

adb: fix error handling of non-adb files

cute-signatures
Timo Teräs 2021-07-25 08:52:43 +03:00
parent 3d203e8f5f
commit c1405f9311
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/adb.c
View File

@ -257,7 +257,10 @@ err:
int adb_m_process(struct adb *db, struct apk_istream *is, uint32_t expected_schema, int adb_m_process(struct adb *db, struct apk_istream *is, uint32_t expected_schema,
struct apk_trust *t, int (*cb)(struct adb *, struct adb_block *, struct apk_istream *)) struct apk_trust *t, int (*cb)(struct adb *, struct adb_block *, struct apk_istream *))
{ {
apk_blob_t mmap = apk_istream_mmap(is); apk_blob_t mmap;
if (IS_ERR(is)) return PTR_ERR(is);
mmap = apk_istream_mmap(is);
memset(db, 0, sizeof *db); memset(db, 0, sizeof *db);
if (expected_schema & ADB_SCHEMA_IMPLIED) if (expected_schema & ADB_SCHEMA_IMPLIED)
db->schema = expected_schema & ~ADB_SCHEMA_IMPLIED; db->schema = expected_schema & ~ADB_SCHEMA_IMPLIED;

5
src/adb_comp.c
View File

@ -11,13 +11,14 @@
struct apk_istream *adb_decompress(struct apk_istream *is, adb_comp_t *compression) struct apk_istream *adb_decompress(struct apk_istream *is, adb_comp_t *compression)
{ {
adb_comp_t c = -1; adb_comp_t c = -1;
if (IS_ERR_OR_NULL(is)) return is; if (IS_ERR_OR_NULL(is)) return is;
uint8_t *buf = apk_istream_peek(is, 4); uint8_t *buf = apk_istream_peek(is, 4);
if (IS_ERR(buf)) return ERR_PTR(apk_istream_close_error(is, PTR_ERR(buf))); if (IS_ERR(buf)) return ERR_PTR(apk_istream_close_error(is, PTR_ERR(buf)));
if (memcmp(buf, "ADB", 3) == 0) switch (buf[3]) { if (memcmp(buf, "ADB", 3) != 0) return ERR_PTR(apk_istream_close_error(is, -APKE_ADB_HEADER));
switch (buf[3]) {
case '.': case '.':
c = ADB_COMP_NONE; c = ADB_COMP_NONE;
break; break;