commit 06e4a6df0a31138b50b81b6931d6f39f207cd456
author Bram Moolenaar <Bram@vim.org> Thu Jun 12 11:49:46 2014 +0200
committer Bram Moolenaar <Bram@vim.org> Thu Jun 12 11:49:46 2014 +0200
tree c31dbd5e8f9f74001cb8d389a0136364fc84d689
parent 7116aa0f7d4c3f50f6898798c3047f5232aabe4a

updated for version 7.4.317
Problem:    Crash when starting gvim.  Issue 230.
Solution:   Check for a pointer to be NULL. (Christian Brabandt)

src/version.c

diff --git a/src/version.c b/src/version.c
index 6c113c7..a71784f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    317,
+/**/
     316,
 /**/
     315,

src/window.c

diff --git a/src/window.c b/src/window.c
index 856e7c4..fe6f335 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4721,8 +4721,12 @@
 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;
+    }
 }
 
 /*