tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

org-crypt: Fix data loss when providing an empty key 

* lisp/org-crypt.el (org-encrypt-entry): Insert original text back
  upon encryption failure.

Reported-by: fxiny <wtimew@libero.it>
<http://permalink.gmane.org/gmane.emacs.orgmode/111115>
This commit is contained in:
Nicolas Goaziou 2017-01-01 10:26:22 +01:00
parent dff9cf9c80
commit dd727cf0cb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org-crypt.el
View File

@ -183,7 +183,11 @@ See `org-crypt-disable-auto-save'."
(org-end-of-subtree t t)
(org-back-over-empty-lines)
(let ((contents (delete-and-extract-region beg (point))))
(insert (org-encrypt-string contents crypt-key)))
(condition-case err
(insert (org-encrypt-string contents crypt-key))
;; If encryption failed, make sure to insert back entry
;; contents in the buffer.
(error (insert contents) (error (nth 1 err)))))
(when folded
(goto-char start-heading)
(outline-hide-subtree))