To: vim-dev@vim.org Subject: Patch 6.1.429 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.429 (depends on 6.1.390) Problem: Crash when using showmarks.vim plugin. (Charles Campbell) Solution: Check for sign_get_text() returning a NULL pointer. Files: src/screen.c *** ../vim61.428/src/screen.c Wed Mar 26 21:35:24 2003 --- src/screen.c Mon Mar 24 20:15:10 2003 *************** *** 2910,2917 **** # endif { p_extra = sign_get_text(text_sign); ! c_extra = NUL; ! n_extra = STRLEN(p_extra); char_attr = sign_get_attr(text_sign, FALSE); } } --- 2910,2920 ---- # endif { p_extra = sign_get_text(text_sign); ! if (p_extra != NULL) ! { ! c_extra = NUL; ! n_extra = STRLEN(p_extra); ! } char_attr = sign_get_attr(text_sign, FALSE); } } *** ../vim61.428/src/version.c Mon Mar 31 20:44:10 2003 --- src/version.c Mon Mar 31 20:49:38 2003 *************** *** 613,614 **** --- 613,616 ---- { /* Add new patch number below this line */ + /**/ + 429, /**/ -- In his lifetime van Gogh painted 486 oil paintings. Oddly enough, 8975 of them are to be found in the United States. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///