From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 12 Jun 2014 09:49:46 +0000 (+0200)
Subject: updated for version 7.4.317
X-Git-Tag: v7.4.317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06e4a6df0a31138b50b81b6931d6f39f207cd456;p=thirdparty%2Fvim.git

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

diff --git a/src/version.c b/src/version.c
index 6c113c7b06..a71784fd21 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    317,
 /**/
     316,
 /**/
diff --git a/src/window.c b/src/window.c
index 856e7c4596..fe6f335cca 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;
+    }
 }
 
 /*