From 4850828e07fb59cf33b828667e471fefe2867a3c Mon Sep 17 00:00:00 2001
From: Manuel Ebert <manuel.ebert@upf.edu>
Date: Thu, 24 May 2012 17:04:10 +0200
Subject: [PATCH] Error message when journal is corrupted, closes #22

---
 jrnl/Journal.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jrnl/Journal.py b/jrnl/Journal.py
index 374b8a6d..3b0ccb6d 100644
--- a/jrnl/Journal.py
+++ b/jrnl/Journal.py
@@ -50,7 +50,11 @@ class Journal:
         if not cipher:
             return ""
         crypto = AES.new(self.key, AES.MODE_CBC, cipher[:16])
-        plain = crypto.decrypt(cipher[16:])
+        try:
+            plain = crypto.decrypt(cipher[16:])
+        except ValueError:
+            print("ERROR: Your journal file seems to be corrupted. You do have a backup, don't you?")
+            sys.exit(-1)
         if plain[-1] != " ": # Journals are always padded
             return None
         else: