To: vim_dev@googlegroups.com
Subject: Patch 8.0.1439
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.0.1439
Problem:    If cscope fails a search Vim may hang.
Solution:   Bail out when a search error is encountered. (Safouane Baroudi,
            closes #2598)
Files:      src/if_cscope.c


*** ../vim-8.0.1438/src/if_cscope.c	2017-09-16 20:54:47.102560387 +0200
--- src/if_cscope.c	2018-01-30 21:44:06.387063222 +0100
***************
*** 677,683 ****
  {
      char *stok;
      char *buf;
!     int nlines;
  
      buf = (char *)alloc(CSREAD_BUFSIZE);
      if (buf == NULL)
--- 677,683 ----
  {
      char *stok;
      char *buf;
!     int nlines = 0;
  
      buf = (char *)alloc(CSREAD_BUFSIZE);
      if (buf == NULL)
***************
*** 700,706 ****
--- 700,709 ----
  	 * cscope will output error messages before the number-of-lines output.
  	 * Display/discard any output that doesn't match what we want.
  	 * Accept "\S*cscope: X lines", also matches "mlcscope".
+ 	 * Bail out for the "Unable to search" error.
  	 */
+ 	if (strstr((const char *)stok, "Unable to search database") != NULL)
+ 	    break;
  	if ((stok = strtok(buf, (const char *)" ")) == NULL)
  	    continue;
  	if (strstr((const char *)stok, "cscope:") == NULL)
*** ../vim-8.0.1438/src/version.c	2018-01-29 09:17:28.670732722 +0100
--- src/version.c	2018-01-30 21:45:15.426495382 +0100
***************
*** 773,774 ****
--- 773,776 ----
  {   /* Add new patch number below this line */
+ /**/
+     1439,
  /**/

-- 
MAN:     You don't frighten us, English pig-dog!  Go and boil your bottoms,
         son of a silly person.  I blow my nose on you, so-called Arthur-king,
         you and your silly English K...kaniggets.
   He puts hands to his ears and blows a raspberry.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// 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    ///