8b9a1c
To: vim_dev@googlegroups.com
8b9a1c
Subject: Patch 7.4.113
8b9a1c
Fcc: outbox
8b9a1c
From: Bram Moolenaar <Bram@moolenaar.net>
8b9a1c
Mime-Version: 1.0
8b9a1c
Content-Type: text/plain; charset=UTF-8
8b9a1c
Content-Transfer-Encoding: 8bit
8b9a1c
------------
8b9a1c
8b9a1c
Patch 7.4.113
8b9a1c
Problem:    MSVC static analysis gives warnings.
8b9a1c
Solution:   Avoid the warnings and avoid possible bugs. (Ken Takata)
8b9a1c
Files:	    src/os_win32.c
8b9a1c
8b9a1c
8b9a1c
*** ../vim-7.4.112/src/os_win32.c	2013-11-21 12:34:07.000000000 +0100
8b9a1c
--- src/os_win32.c	2013-12-07 14:41:35.000000000 +0100
8b9a1c
***************
8b9a1c
*** 2509,2515 ****
8b9a1c
      WCHAR		*porig, *porigPrev;
8b9a1c
      int			flen;
8b9a1c
      WIN32_FIND_DATAW	fb;
8b9a1c
!     HANDLE		hFind;
8b9a1c
      int			c;
8b9a1c
      int			slen;
8b9a1c
  
8b9a1c
--- 2509,2515 ----
8b9a1c
      WCHAR		*porig, *porigPrev;
8b9a1c
      int			flen;
8b9a1c
      WIN32_FIND_DATAW	fb;
8b9a1c
!     HANDLE		hFind = INVALID_HANDLE_VALUE;
8b9a1c
      int			c;
8b9a1c
      int			slen;
8b9a1c
  
8b9a1c
***************
8b9a1c
*** 2528,2535 ****
8b9a1c
  	/* copy leading drive letter */
8b9a1c
  	*ptrue++ = *porig++;
8b9a1c
  	*ptrue++ = *porig++;
8b9a1c
- 	*ptrue = NUL;	    /* in case nothing follows */
8b9a1c
      }
8b9a1c
  
8b9a1c
      while (*porig != NUL)
8b9a1c
      {
8b9a1c
--- 2528,2535 ----
8b9a1c
  	/* copy leading drive letter */
8b9a1c
  	*ptrue++ = *porig++;
8b9a1c
  	*ptrue++ = *porig++;
8b9a1c
      }
8b9a1c
+     *ptrue = NUL;	    /* in case nothing follows */
8b9a1c
  
8b9a1c
      while (*porig != NUL)
8b9a1c
      {
8b9a1c
***************
8b9a1c
*** 2673,2680 ****
8b9a1c
  	/* copy leading drive letter */
8b9a1c
  	*ptrue++ = *porig++;
8b9a1c
  	*ptrue++ = *porig++;
8b9a1c
- 	*ptrue = NUL;	    /* in case nothing follows */
8b9a1c
      }
8b9a1c
  
8b9a1c
      while (*porig != NUL)
8b9a1c
      {
8b9a1c
--- 2673,2680 ----
8b9a1c
  	/* copy leading drive letter */
8b9a1c
  	*ptrue++ = *porig++;
8b9a1c
  	*ptrue++ = *porig++;
8b9a1c
      }
8b9a1c
+     *ptrue = NUL;	    /* in case nothing follows */
8b9a1c
  
8b9a1c
      while (*porig != NUL)
8b9a1c
      {
8b9a1c
***************
8b9a1c
*** 6272,6277 ****
8b9a1c
--- 6272,6278 ----
8b9a1c
  		    while (i > 0)
8b9a1c
  			free(argv[--i]);
8b9a1c
  		    free(argv);
8b9a1c
+ 		    argv = NULL;
8b9a1c
  		    argc = 0;
8b9a1c
  		}
8b9a1c
  	    }
8b9a1c
*** ../vim-7.4.112/src/version.c	2013-12-07 14:32:04.000000000 +0100
8b9a1c
--- src/version.c	2013-12-07 14:37:48.000000000 +0100
8b9a1c
***************
8b9a1c
*** 740,741 ****
8b9a1c
--- 740,743 ----
8b9a1c
  {   /* Add new patch number below this line */
8b9a1c
+ /**/
8b9a1c
+     113,
8b9a1c
  /**/
8b9a1c
8b9a1c
-- 
8b9a1c
How To Keep A Healthy Level Of Insanity:
8b9a1c
15. Five days in advance, tell your friends you can't attend their
8b9a1c
    party because you're not in the mood.
8b9a1c
8b9a1c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8b9a1c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8b9a1c
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
8b9a1c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///