summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-12-07 14:48:10 +0100
committerBram Moolenaar <bram@vim.org>2013-12-07 14:48:10 +0100
commitb89e6fc174fec91c2e73799339d25508e1bbe9a1 (patch)
treecabef54899e49b64a2a907db573e17642342f20f
parent8363d01147e94f332d791e553d1eaa42a143ab8a (diff)
downloadvim-b89e6fc174fec91c2e73799339d25508e1bbe9a1.tar.gz
updated for version 7.4.113v7.4.113v7-4-113
Problem: MSVC static analysis gives warnings. Solution: Avoid the warnings and avoid possible bugs. (Ken Takata)
-rw-r--r--src/os_win32.c7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 413dbfa0..91c8368f 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2509,7 +2509,7 @@ fname_casew(
WCHAR *porig, *porigPrev;
int flen;
WIN32_FIND_DATAW fb;
- HANDLE hFind;
+ HANDLE hFind = INVALID_HANDLE_VALUE;
int c;
int slen;
@@ -2528,8 +2528,8 @@ fname_casew(
/* copy leading drive letter */
*ptrue++ = *porig++;
*ptrue++ = *porig++;
- *ptrue = NUL; /* in case nothing follows */
}
+ *ptrue = NUL; /* in case nothing follows */
while (*porig != NUL)
{
@@ -2673,8 +2673,8 @@ fname_case(
/* copy leading drive letter */
*ptrue++ = *porig++;
*ptrue++ = *porig++;
- *ptrue = NUL; /* in case nothing follows */
}
+ *ptrue = NUL; /* in case nothing follows */
while (*porig != NUL)
{
@@ -6272,6 +6272,7 @@ get_cmd_argsW(char ***argvp)
while (i > 0)
free(argv[--i]);
free(argv);
+ argv = NULL;
argc = 0;
}
}
diff --git a/src/version.c b/src/version.c
index 69be33b0..77020f2e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 113,
+/**/
112,
/**/
111,