From bee490d091553b88cb605a1577c016f80c247d98 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Thu, 3 Nov 2022 22:41:30 +0100
Subject: [PATCH] Check for nulls when opening ContentResolver streams

---
 .../java/com/beemdevelopment/aegis/ui/tasks/ExportTask.java   | 3 +++
 .../com/beemdevelopment/aegis/ui/tasks/ImportFileTask.java    | 4 ++++
 .../beemdevelopment/aegis/ui/tasks/ImportIconPackTask.java    | 3 +++
 .../java/com/beemdevelopment/aegis/ui/tasks/QrDecodeTask.java | 3 +++
 .../com/beemdevelopment/aegis/vault/VaultBackupManager.java   | 3 +++
 5 files changed, 16 insertions(+)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ExportTask.java b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ExportTask.java
index 3b198ef5..590e05d0 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ExportTask.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ExportTask.java
@@ -27,6 +27,9 @@ public class ExportTask extends ProgressDialogTask<ExportTask.Params, Exception>
         ExportTask.Params params = args[0];
         try (InputStream inStream = new FileInputStream(params.getFile());
              OutputStream outStream = getDialog().getContext().getContentResolver().openOutputStream(params.getDestUri(), "w")) {
+            if (outStream == null) {
+                throw new IOException("openOutputStream returned null");
+            }
             IOUtils.copy(inStream, outStream);
             return null;
         } catch (IOException e) {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ImportFileTask.java b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ImportFileTask.java
index f62960e8..b4bd8808 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ImportFileTask.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ImportFileTask.java
@@ -29,6 +29,10 @@ public class ImportFileTask extends ProgressDialogTask<ImportFileTask.Params, Im
 
         Params p = params[0];
         try (InputStream inStream = context.getContentResolver().openInputStream(p.getUri())) {
+            if (inStream == null) {
+                throw new IOException("openInputStream returned null");
+            }
+
             String prefix = p.getNamePrefix() != null ? p.getNamePrefix() + "-" : "";
             String suffix = p.getNameSuffix() != null ? "-" + p.getNameSuffix() : "";
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ImportIconPackTask.java b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ImportIconPackTask.java
index 5f3b6516..86224e21 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ImportIconPackTask.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ImportIconPackTask.java
@@ -32,6 +32,9 @@ public class ImportIconPackTask extends ProgressDialogTask<ImportIconPackTask.Pa
             tempFile = File.createTempFile("icon-pack-", "", context.getCacheDir());
             try (InputStream inStream = context.getContentResolver().openInputStream(param.getUri());
                  FileOutputStream outStream = new FileOutputStream(tempFile)) {
+                if (inStream == null) {
+                    throw new IOException("openInputStream returned null");
+                }
                 IOUtils.copy(inStream, outStream);
             }
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/QrDecodeTask.java b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/QrDecodeTask.java
index 61b7af41..198a9e59 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/QrDecodeTask.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/QrDecodeTask.java
@@ -33,6 +33,9 @@ public class QrDecodeTask extends ProgressDialogTask<List<Uri>, List<QrDecodeTas
             }
 
             try (InputStream inStream = context.getContentResolver().openInputStream(uri)) {
+                if (inStream == null) {
+                    throw new IOException("openInputStream returned null");
+                }
                 com.google.zxing.Result result = QrCodeHelper.decodeFromStream(inStream);
                 res.add(new Result(uri, fileName, result, null));
             } catch (QrCodeHelper.DecodeError | IOException e) {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupManager.java b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupManager.java
index 5108a70f..47d16523 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupManager.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultBackupManager.java
@@ -85,6 +85,9 @@ public class VaultBackupManager {
 
             try (FileInputStream inStream = new FileInputStream(tempFile);
                  OutputStream outStream = _context.getContentResolver().openOutputStream(file.getUri())) {
+                if (outStream == null) {
+                    throw new IOException("openOutputStream returned null");
+                }
                 IOUtils.copy(inStream, outStream);
             } catch (IOException e) {
                 throw new VaultRepositoryException(e);