diff options
| author | Bram Moolenaar <bram@vim.org> | 2014-06-12 11:49:46 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2014-06-12 11:49:46 +0200 |
| commit | 5c4939184afca1d125e312d04d6c1b92d8b708d8 (patch) | |
| tree | e023c72abf0356a544638b6b5e5610ae1ef27958 | |
| parent | 0818daedb47a53858d12a7a7b99ebc05c8e3a8bc (diff) | |
| download | vim-5c4939184afca1d125e312d04d6c1b92d8b708d8.tar.gz | |
Problem: Crash when starting gvim. Issue 230.
Solution: Check for a pointer to be NULL. (Christian Brabandt)
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/window.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/version.c b/src/version.c index 6c113c7b..a71784fd 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 317, +/**/ 316, /**/ 315, diff --git a/src/window.c b/src/window.c index 856e7c45..fe6f335c 100644 --- a/src/window.c +++ b/src/window.c @@ -4721,8 +4721,12 @@ win_alloc_lines(wp) win_free_lsize(wp) win_T *wp; { - vim_free(wp->w_lines); - wp->w_lines = NULL; + /* TODO: why would wp be NULL here? */ + if (wp != NULL) + { + vim_free(wp->w_lines); + wp->w_lines = NULL; + } } /* |