Merge from emacs-24; up to 2014-05-01T10:21:17Z!rgm@gnu.org

2 files changed, 11 insertions, 2 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 9e7773a7421..f31d2619319 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * cmdproxy.c (make_absolute): Don't copy more characters from PATH
+        than a single directory name can hold.  (Bug#17334)
+
 2014-04-22  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/ms-w32.h (lseek): Define only if not already a macro.
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index f3433f63684..e48ca63a257 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -292,11 +292,15 @@ make_absolute (const char *prog)
 
   while (*path)
     {
+      size_t len;
+
       /* Get next directory from path.  */
       p = path;
       while (*p && *p != ';') p++;
-      strncpy (dir, path, p - path);
-      dir[p - path] = '\0';
+      /* A broken PATH could have too long directory names in it.  */
+      len = min (p - path, sizeof (dir) - 1);
+      strncpy (dir, path, len);
+      dir[len] = '\0';
 
       /* Search the directory for the program.  */
       if (search_dir (dir, prog, MAX_PATH, absname) > 0)