From 1a64b3a4871cceb1b42d5c54ada58ab1241022f6 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 20 Sep 2018 14:21:57 +0800
Subject: [PATCH] FIX: Don't try to recover an invalid sha1.

---
 lib/upload_recovery.rb           | 2 +-
 spec/lib/upload_recovery_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/upload_recovery.rb b/lib/upload_recovery.rb
index fba1a0073d2..ef13002d27b 100644
--- a/lib/upload_recovery.rb
+++ b/lib/upload_recovery.rb
@@ -51,7 +51,7 @@ class UploadRecovery
   private
 
   def recover_post_upload(post, sha1)
-    return unless sha1.present?
+    return unless sha1.present? && sha1.length == Upload::SHA1_LENGTH
 
     attributes = {
       post: post,
diff --git a/spec/lib/upload_recovery_spec.rb b/spec/lib/upload_recovery_spec.rb
index 40225d260e6..17240853400 100644
--- a/spec/lib/upload_recovery_spec.rb
+++ b/spec/lib/upload_recovery_spec.rb
@@ -55,6 +55,12 @@ RSpec.describe UploadRecovery do
         )
 
         upload_recovery.recover
+
+        post.update!(
+          raw: "<a href=#{"/uploads/test/original/3X/a/6%0A/#{upload.sha1}.png"}>test</a>"
+        )
+
+        upload_recovery.recover
       end
     end