From 902ae3f0cf70ad8eb286c929ba0a0e1f3deebc77 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 12 Jun 2017 17:07:29 +0200
Subject: [PATCH] Fix for #671

---
 .../Attachment/AttachmentRepository.php             | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php
index b7c174b103..91a3dcbd73 100644
--- a/app/Repositories/Attachment/AttachmentRepository.php
+++ b/app/Repositories/Attachment/AttachmentRepository.php
@@ -19,6 +19,7 @@ use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
 use FireflyIII\Models\Attachment;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
+use Log;
 use Storage;
 
 /**
@@ -95,16 +96,20 @@ class AttachmentRepository implements AttachmentRepositoryInterface
     public function getContent(Attachment $attachment): string
     {
         // create a disk.
-        $disk = Storage::disk('upload');
-        $file = $attachment->fileName();
+        $disk    = Storage::disk('upload');
+        $file    = $attachment->fileName();
+        $content = '';
 
         if ($disk->exists($file)) {
             $content = Crypt::decrypt($disk->get($file));
+        }
+        if (is_bool($content)) {
+            Log::error(sprintf('Attachment #%d may be corrupted: the content could not be decrypted.', $attachment->id));
 
-            return $content;
+            return '';
         }
 
-        return '';
+        return $content;
     }
 
     /**