summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-06-12 11:49:46 +0200
committerBram Moolenaar <Bram@vim.org>2014-06-12 11:49:46 +0200
commit06e4a6df0a31138b50b81b6931d6f39f207cd456 (patch)
treec31dbd5e8f9f74001cb8d389a0136364fc84d689
parent7116aa0f7d4c3f50f6898798c3047f5232aabe4a (diff)
downloadvim-git-7.4.317.tar.gz
updated for version 7.4.317v7.4.317
Problem: Crash when starting gvim. Issue 230. Solution: Check for a pointer to be NULL. (Christian Brabandt)
-rw-r--r--src/version.c2
-rw-r--r--src/window.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/src/version.c b/src/version.c
index 6c113c7b0..a71784fd2 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 856e7c459..fe6f335cc 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;
+ }
}
/*