patch 8.0.1412: using free memory using setloclist()

Problem:    Using free memory using setloclist(). (Dominique Pelle)
Solution:   Mark location list context as still in use when needed. (Yegappan
            Lakshmanan, closes #2462)

diff --git a/src/quickfix.c b/src/quickfix.c
index d09a334339fe14ddf33bd5bdc236b98aed53d49a..6e80ddfca302a09e55b24ccc9a0f626db443d0e6 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -5486,6 +5486,16 @@ set_ref_in_quickfix(int copyID)
            if (abort)
                return abort;
        }
+       if (IS_LL_WINDOW(win) && (win->w_llist_ref->qf_refcount == 1))
+       {
+           /* In a location list window and none of the other windows is
+            * referring to this location list. Mark the location list
+            * context as still in use.
+            */
+           abort = mark_quickfix_ctx(win->w_llist_ref, copyID);
+           if (abort)
+               return abort;
+       }
     }
 
     return abort;

diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index 2204574998fb9ee60cda082ea4bd168d44d12ae7..8d0c198ba0005fb9bf22c812aa9d3c231b764341 100644 (file)
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -3017,3 +3017,17 @@ func Test_qf_tick()
   call Xqftick_tests('c')
   call Xqftick_tests('l')
 endfunc
+
+" The following test used to crash Vim.
+" Open the location list window and close the regular window associated with
+" the location list. When the garbage collection runs now, it incorrectly
+" marks the location list context as not in use and frees the context.
+func Test_ll_window_ctx()
+  call setloclist(0, [], 'f')
+  call setloclist(0, [], 'a', {'context' : []})
+  lopen | only
+  call test_garbagecollect_now()
+  echo getloclist(0, {'context' : 1}).context
+  enew | only
+endfunc
+

diff --git a/src/version.c b/src/version.c
index ec17e4e67256186ebeea853e7f1cc483fb0da596..22df4f924d1c41fe36e9e43fd522f14ec42c316e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1412,
 /**/
     1411,
 /**/