changeset 7186:41885de3d577 v7.4.903

commit https://github.com/vim/vim/commit/7314efd87d8c4095229bdc2867a553c36c064918 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 31 15:32:52 2015 +0100 patch 7.4.903 Problem: MS-Windows: When 'encoding' differs from the current code page, expandinig wildcards may cause illegal memory access. Solution: Allocate a longer buffer. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Sat, 31 Oct 2015 15:45:04 +0100
parents b8b6bf43ec2f
children 02e493756808
files src/misc1.c src/version.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -9940,8 +9940,9 @@ dos_expandpath(
 	    return 0;
     }
 
-    /* make room for file name */
-    buf = alloc((int)STRLEN(path) + BASENAMELEN + 5);
+    /* Make room for file name.  When doing encoding conversion the actual
+     * length may be quite a bit longer, thus use the maximum possible length. */
+    buf = alloc((int)MAXPATHL);
     if (buf == NULL)
 	return 0;
 
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    903,
+/**/
     902,
 /**/
     901,