To: vim-dev@vim.org

Subject: Patch 7.2.037

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=ISO-8859-1

Content-Transfer-Encoding: 8bit

------------

Patch 7.2.037

Problem:    Double free with GTK 1 and compiled with EXITFREE.

Solution:   Don't close display. (Dominique Pelle)

Files:	    src/os_unix.c

*** ../vim-7.2.036/src/os_unix.c	Wed Nov 12 13:07:48 2008

--- src/os_unix.c	Wed Nov 12 11:55:33 2008

***************

*** 2936,2942 ****

      }

  #  endif

  # endif

! # ifdef FEAT_X11

      if (x11_display != NULL

  #  ifdef FEAT_XCLIPBOARD

  	    && x11_display != xterm_dpy

--- 2936,2943 ----

      }

  #  endif

  # endif

!     /* Don't close the display for GTK 1, it is done in exit(). */

! # if defined(FEAT_X11) && (!defined(FEAT_GUI_GTK) || defined(HAVE_GTK2))

      if (x11_display != NULL

  #  ifdef FEAT_XCLIPBOARD

  	    && x11_display != xterm_dpy

*** ../vim-7.2.036/src/version.c	Wed Nov 12 13:35:31 2008

--- src/version.c	Wed Nov 12 14:08:56 2008

***************

*** 678,679 ****

--- 678,681 ----

  {   /* Add new patch number below this line */

+ /**/

+     37,

  /**/

-- 

hundred-and-one symptoms of being an internet addict:

240. You think Webster's Dictionary is a directory of WEB sites.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\        download, build and distribute -- http://www.A-A-P.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///