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

io: fix tee error handling path 

Make sure the from is not dereferenced/used on error path, and
cancel the ostream.

fixes #10800
cute-signatures
Timo Teräs 2021-12-27 10:20:03 +02:00
parent 4ccf038a9f
commit 0baf59627b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/io.c
View File

@ -462,9 +462,12 @@ struct apk_istream *apk_istream_tee(struct apk_istream *from, struct apk_ostream
err_free: err_free:
free(tee); free(tee);
err: err:
if (!IS_ERR(to)) apk_ostream_close(to); if (!IS_ERR(to)) {
if (!IS_ERR(from) && (flags & APK_ISTREAM_TEE_OPTIONAL)) apk_ostream_cancel(to, r);
return from; apk_ostream_close(to);
}
if (IS_ERR(from)) return ERR_CAST(from);
if (flags & APK_ISTREAM_TEE_OPTIONAL) return from;
return ERR_PTR(apk_istream_close_error(from, r)); return ERR_PTR(apk_istream_close_error(from, r));
} }