empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Always try to close the PartProvider open file pipe.

Browse source
This commit is contained in:
Cody Henthorne 2022-05-13 08:31:23 -04:00
parent b527b2ffb9
commit d97184ef60
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java
View file

@ -157,19 +157,27 @@ public final class PartProvider extends BaseContentProvider {
ParcelFileDescriptor[] reliablePipe = ParcelFileDescriptor.createReliablePipe(); ParcelFileDescriptor[] reliablePipe = ParcelFileDescriptor.createReliablePipe();
SignalExecutors.BOUNDED_IO.execute(() -> { SignalExecutors.BOUNDED_IO.execute(() -> {
Throwable error = null;
try (OutputStream out = new FileOutputStream(reliablePipe[1].getFileDescriptor())) { try (OutputStream out = new FileOutputStream(reliablePipe[1].getFileDescriptor())) {
try(InputStream in = SignalDatabase.attachments().getAttachmentStream(attachmentId, 0)) { try (InputStream in = SignalDatabase.attachments().getAttachmentStream(attachmentId, 0)) {
StreamUtil.copy(in, out); StreamUtil.copy(in, out);
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "Error providing file", e); Log.w(TAG, "Error providing file", e);
try { error = e;
reliablePipe[1].closeWithError(e.getMessage());
} catch (IOException e2) {
Log.w(TAG, "Error closing pipe with error", e2);
}
} }
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "Error opening pipe for writing", e); Log.w(TAG, "Error opening pipe for writing", e);
error = e;
} finally {
try {
if (error != null) {
reliablePipe[1].closeWithError("Error writing file: " + error.getMessage());
} else {
reliablePipe[1].close();
}
} catch (IOException e2) {
Log.w(TAG, "Error closing pipe", e2);
}
} }
}); });