From 0fe849a13b4c0753d6b2424783879696a1fd4421 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 25 Jul 2010 15:11:11 +0200
Subject: [PATCH] Better fix for memory access in recovery. (Dominique Pelle)

---
 src/memline.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/memline.c b/src/memline.c
index 148da61d0a..ce1592637b 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -1170,6 +1170,10 @@ ml_recover()
     buf->b_ml.ml_line_lnum = 0;		/* no cached line */
     buf->b_ml.ml_locked = NULL;		/* no locked block */
     buf->b_ml.ml_flags = 0;
+#ifdef FEAT_CRYPT
+    buf->b_p_key = empty_option;
+    buf->b_p_cm = empty_option;
+#endif
 
     /*
      * open the memfile from the old swap file
@@ -1187,8 +1191,6 @@ ml_recover()
     buf->b_ml.ml_mfp = mfp;
 #ifdef FEAT_CRYPT
     mfp->mf_buffer = buf;
-    buf->b_p_key = empty_option;
-    buf->b_p_cm = empty_option;
 #endif
 
     /*
-- 
GitLab