From 06e4a6df0a31138b50b81b6931d6f39f207cd456 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 12 Jun 2014 11:49:46 +0200
Subject: [PATCH] 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 | 2 ++
 src/window.c  | 8 ++++++--
 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
@@ -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 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;
+    }
 }
 
 /*
-- 
2.50.1