Fix backup NPE

Fixes #7526
This commit is contained in:
Moxie Marlinspike 2018-03-14 23:40:01 -07:00
parent 90006e81db
commit 73233c01ba

View File

@ -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();