Skip to content

Fix InputStream leak in UploadModel.buildContributions() #6861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Roniscend wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −3
Open

Fix InputStream leak in UploadModel.buildContributions() #6861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/upload/UploadModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,12 @@ class UploadModel @Inject internal constructor(

fun buildContributions(): Observable<Contribution> {
return Observable.fromIterable(items).map { item: UploadItem ->
val imageSHA1 = getSHA1(
context.contentResolver.openInputStream(item.contentUri!!)!!
)
val inputStream = requireNotNull(context.contentResolver.openInputStream(item.contentUri!!)) {
"Unable to open InputStream for contentUri: ${item.contentUri}"
}
val imageSHA1 = inputStream.use {
getSHA1(it)
}
val contribution = Contribution(
item,
sessionManager,
Expand Down
Loading