From 73233c01ba5732af639d392736f168e3db3c1b15 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 14 Mar 2018 23:40:01 -0700
Subject: [PATCH] Fix backup NPE

Fixes #7526
---
 .../thoughtcrime/securesms/backup/FullBackupExporter.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java b/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java
index 8577b0465f..7366c56619 100644
--- a/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java
+++ b/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java
@@ -265,8 +265,11 @@ public class FullBackupExporter extends FullBackupBase {
 
         while ((read = in.read(buffer)) != -1) {
           byte[] ciphertext = cipher.update(buffer, 0, read);
-          outputStream.write(ciphertext);
-          mac.update(ciphertext);
+
+          if (ciphertext != null) {
+            outputStream.write(ciphertext);
+            mac.update(ciphertext);
+          }
         }
 
         byte[] remainder = cipher.doFinal();