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