To: vim_dev@googlegroups.com Subject: Patch 7.4.2330 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2330 Problem: Coverity complains about not checking curwin to be NULL. Solution: Use firstwin to avoid the warning. Files: src/buffer.c *** ../vim-7.4.2329/src/buffer.c 2016-09-04 21:33:05.306834444 +0200 --- src/buffer.c 2016-09-04 21:51:43.153307277 +0200 *************** *** 707,713 **** int is_curbuf = (buf == curbuf); bufref_T bufref; # ifdef FEAT_WINDOWS ! int is_curwin = (curwin!= NULL && curwin->w_buffer == buf); win_T *the_curwin = curwin; tabpage_T *the_curtab = curtab; # endif --- 707,713 ---- int is_curbuf = (buf == curbuf); bufref_T bufref; # ifdef FEAT_WINDOWS ! int is_curwin = (curwin != NULL && curwin->w_buffer == buf); win_T *the_curwin = curwin; tabpage_T *the_curtab = curtab; # endif *************** *** 772,778 **** #endif #ifdef FEAT_SYN_HL /* Remove any ownsyntax, unless exiting. */ ! if (firstwin != NULL && curwin->w_buffer == buf) reset_synblock(curwin); #endif --- 772,778 ---- #endif #ifdef FEAT_SYN_HL /* Remove any ownsyntax, unless exiting. */ ! if (curwin != NULL && curwin->w_buffer == buf) reset_synblock(curwin); #endif *************** *** 788,794 **** clearFolding(win); } # else ! if (curwin->w_buffer == buf) clearFolding(curwin); # endif #endif --- 788,794 ---- clearFolding(win); } # else ! if (curwin != NULL && curwin->w_buffer == buf) clearFolding(curwin); # endif #endif *** ../vim-7.4.2329/src/version.c 2016-09-04 21:42:32.414056019 +0200 --- src/version.c 2016-09-04 21:49:23.514519292 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2330, /**/ -- Apathy Error: Don't bother striking any key. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///