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)

diff --git a/src/misc1.c b/src/misc1.c
index aacf610ad8ef887bfddaec42d4731d540853e104..fa1e049d31069745cb28d6e90f64c02bcb9c5aaa 100644 (file)
--- 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 410ce8f3745df60b53a212c5aebef60126cc7500..d6fc7d45e7b174ffbe6663ac56fffd7ea0dfc86c 100644 (file)
--- 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,
 /**/