patch 8.0.0083

Problem:    Using freed memory with win_getid(). (Domenique Pelle)
Solution:   For the current tab use curwin.

diff --git a/src/testdir/test_window_id.vim b/src/testdir/test_window_id.vim
index 66656e1d0a9c943c6e9453aab69fa48c72563a2a..b3b506d04d8c7141ced16ecd2ac6d886594bb3ad 100644 (file)
--- a/src/testdir/test_window_id.vim
+++ b/src/testdir/test_window_id.vim
@@ -92,3 +92,12 @@ func Test_win_getid()
 
   only!
 endfunc
+
+func Test_win_getid_curtab()
+  tabedit X
+  tabfirst
+  copen
+  only
+  call assert_equal(win_getid(1), win_getid(1, 1))
+  tabclose!
+endfunc

diff --git a/src/version.c b/src/version.c
index e85192247e2c5274c114b7a54174fb2dc5092621..c7f00a8764065dc4d4c3931efd6737b51f64c91b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    83,
 /**/
     82,
 /**/

diff --git a/src/window.c b/src/window.c
index 8e5336883fd0599f2626420339b104077213e7e4..ee5f7aa8aa6ec14f8bfa609a8d03783877da19ef 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -7133,7 +7133,10 @@ win_getid(typval_T *argvars)
                    break;
            if (tp == NULL)
                return -1;
-           wp = tp->tp_firstwin;
+           if (tp == curtab)
+               wp = firstwin;
+           else
+               wp = tp->tp_firstwin;
        }
        for ( ; wp != NULL; wp = wp->w_next)
            if (--winnr == 0)