# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1280063471 -7200
# Node ID 9e2e63af1641265645df2b9ae8fce422ef9c073f
# Parent  6bc102a4bff860d481871201fec7996a53e46e16
Better fix for memory access in recovery. (Dominique Pelle)

diff --git a/src/memline.c b/src/memline.c
--- 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
 
     /*