1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
To: vim-dev@vim.org
Subject: Patch 7.2.305
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.305
Problem: Recursively redrawing causes a memory leak. (Dominique Pelle)
Solution: Disallow recursive screen updating.
Files: src/screen.c
*** ../vim-7.2.304/src/screen.c 2009-11-11 17:07:25.000000000 +0100
--- src/screen.c 2009-11-17 16:30:53.000000000 +0100
***************
*** 323,328 ****
--- 323,329 ----
int did_one;
#endif
+ /* Don't do anything if the screen structures are (not yet) valid. */
if (!screen_valid(TRUE))
return;
***************
*** 342,348 ****
if (curwin->w_lines_valid == 0 && type < NOT_VALID)
type = NOT_VALID;
! if (!redrawing())
{
redraw_later(type); /* remember type for next time */
must_redraw = type;
--- 343,351 ----
if (curwin->w_lines_valid == 0 && type < NOT_VALID)
type = NOT_VALID;
! /* Postpone the redrawing when it's not needed and when being called
! * recursively. */
! if (!redrawing() || updating_screen)
{
redraw_later(type); /* remember type for next time */
must_redraw = type;
***************
*** 582,587 ****
--- 585,591 ----
/*
* Prepare for updating one or more windows.
+ * Caller must check for "updating_screen" already set to avoid recursiveness.
*/
static void
update_prepare()
***************
*** 663,669 ****
doit = TRUE;
}
! if (!doit)
return;
/* update all windows that need updating */
--- 667,675 ----
doit = TRUE;
}
! /* Return when there is nothing to do or screen updating already
! * happening. */
! if (!doit || updating_screen)
return;
/* update all windows that need updating */
***************
*** 696,701 ****
--- 702,711 ----
updateWindow(wp)
win_T *wp;
{
+ /* return if already busy updating */
+ if (updating_screen)
+ return;
+
update_prepare();
#ifdef FEAT_CLIPBOARD
*** ../vim-7.2.304/src/version.c 2009-11-25 12:38:49.000000000 +0100
--- src/version.c 2009-11-25 13:01:48.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
{ /* Add new patch number below this line */
+ /**/
+ 305,
/**/
--
If the Universe is constantly expanding, why can't I ever find a parking space?
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
