3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.317
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.317
3ef2ca
Problem:    Crash when starting gvim.  Issue 230.
3ef2ca
Solution:   Check for a pointer to be NULL. (Christian Brabandt)
3ef2ca
Files:	    src/window.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.316/src/window.c	2014-05-28 13:42:59.884078184 +0200
3ef2ca
--- src/window.c	2014-06-12 11:36:53.619441640 +0200
3ef2ca
***************
3ef2ca
*** 4721,4728 ****
3ef2ca
  win_free_lsize(wp)
3ef2ca
      win_T	*wp;
3ef2ca
  {
3ef2ca
!     vim_free(wp->w_lines);
3ef2ca
!     wp->w_lines = NULL;
3ef2ca
  }
3ef2ca
  
3ef2ca
  /*
3ef2ca
--- 4721,4732 ----
3ef2ca
  win_free_lsize(wp)
3ef2ca
      win_T	*wp;
3ef2ca
  {
3ef2ca
!     /* TODO: why would wp be NULL here? */
3ef2ca
!     if (wp != NULL)
3ef2ca
!     {
3ef2ca
! 	vim_free(wp->w_lines);
3ef2ca
! 	wp->w_lines = NULL;
3ef2ca
!     }
3ef2ca
  }
3ef2ca
  
3ef2ca
  /*
3ef2ca
*** ../vim-7.4.316/src/version.c	2014-05-29 14:36:26.156862577 +0200
3ef2ca
--- src/version.c	2014-06-12 11:37:37.907443315 +0200
3ef2ca
***************
3ef2ca
*** 736,737 ****
3ef2ca
--- 736,739 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     317,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
press CTRL-ALT-DEL for more information
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///