From 7314efd87d8c4095229bdc2867a553c36c064918 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 31 Oct 2015 15:32:52 +0100 Subject: [PATCH] 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) --- src/misc1.c | 5 +++-- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/misc1.c b/src/misc1.c index aacf610ad..fa1e049d3 100644 --- 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; diff --git a/src/version.c b/src/version.c index 410ce8f37..d6fc7d45e 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 903, /**/ 902, /**/ -- 2.50.1