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 6c113c7b0670336294c296a301ebc0ef336b7029..a71784fd215fefff5bdb3f7de8965a7db3af821f 100644 (file)
--- 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 856e7c45969fb7a86370f300e8ad630dc6bbb803..fe6f335cca0e1baa9bea041ab2600ea7164cbd98 100644 (file)
--- 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;
+    }
 }
 
 /*