From d670cfc55d96b65e124b09430d8f43909939fc55 Mon Sep 17 00:00:00 2001

From: Peter Stephenson <p.w.stephenson@ntlworld.com>

Date: Thu, 17 Nov 2016 19:49:17 +0000

Subject: [PATCH] 39958: Add extra byte to PATH_MAX allocations.

This ensures we've got enough space for a null, although this

isn't always needed.

Upstream-commit: a62e1640bcafbb82d86ea8d8ce057a83c4683d60

Signed-off-by: Kamil Dudka <kdudka@redhat.com>

---

 Src/builtin.c |  2 +-

 Src/compat.c  |  4 ++--

 Src/exec.c    | 16 ++++++++--------

 Src/glob.c    |  4 ++--

 Src/hist.c    |  2 +-

 Src/utils.c   |  6 +++---

 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Src/builtin.c b/Src/builtin.c

index caa4b64..86d7d9a 100644

--- a/Src/builtin.c

+++ b/Src/builtin.c

@@ -945,7 +945,7 @@ cd_do_chdir(char *cnam, char *dest, int hard)

      * Normalize path under Cygwin to avoid messing with

      * DOS style names with drives in them

      */

-    static char buf[PATH_MAX];

+    static char buf[PATH_MAX+1];

 #ifndef _SYS_CYGWIN_H

     void cygwin_conv_to_posix_path(const char *, char *);

 #endif

diff --git a/Src/compat.c b/Src/compat.c

index cc4e876..d81e3d6 100644

--- a/Src/compat.c

+++ b/Src/compat.c

@@ -270,7 +270,7 @@ zgetdir(struct dirsav *d)

     int len;

 #endif

-    buf = zhalloc(bufsiz = PATH_MAX);

+    buf = zhalloc(bufsiz = PATH_MAX+1);

     pos = bufsiz - 1;

     buf[pos] = '\0';

     strcpy(nbuf, "../");

@@ -439,7 +439,7 @@ zgetcwd(void)

 	    free(cwd);

 	}

 #else

-	char *cwdbuf = zalloc(PATH_MAX);

+	char *cwdbuf = zalloc(PATH_MAX+1);

 	ret = getcwd(cwdbuf, PATH_MAX);

 	if (ret)

 	    ret = dupstring(ret);

diff --git a/Src/exec.c b/Src/exec.c

index c95667e..03716ba 100644

--- a/Src/exec.c

+++ b/Src/exec.c

@@ -434,7 +434,7 @@ static int

 zexecve(char *pth, char **argv, char **newenvp)

 {

     int eno;

-    static char buf[PATH_MAX * 2];

+    static char buf[PATH_MAX * 2+1];

     char **eep;

     unmetafy(pth, NULL);

@@ -575,7 +575,7 @@ static void

 execute(LinkList args, int flags, int defpath)

 {

     Cmdnam cn;

-    char buf[MAXCMDLEN], buf2[MAXCMDLEN];

+    char buf[MAXCMDLEN+1], buf2[MAXCMDLEN+1];

     char *s, *z, *arg0;

     char **argv, **pp, **newenvp = NULL;

     int eno = 0, ee;

@@ -656,7 +656,7 @@ execute(LinkList args, int flags, int defpath)

     /* for command -p, search the default path */

     if (defpath) {

-	char *s, pbuf[PATH_MAX];

+	char *s, pbuf[PATH_MAX+1];

 	char *dptr, *pe, *ps = DEFAULT_PATH;

 	for(;ps;ps = pe ? pe+1 : NULL) {

@@ -693,7 +693,7 @@ execute(LinkList args, int flags, int defpath)

     } else {

 	if ((cn = (Cmdnam) cmdnamtab->getnode(cmdnamtab, arg0))) {

-	    char nn[PATH_MAX], *dptr;

+	    char nn[PATH_MAX+1], *dptr;

 	    if (cn->node.flags & HASHED)

 		strcpy(nn, cn->u.cmd);

@@ -778,7 +778,7 @@ findcmd(char *arg0, int docopy)

 	    break;

 	}

     if (cn) {

-	char nn[PATH_MAX];

+	char nn[PATH_MAX+1];

 	if (cn->node.flags & HASHED)

 	    strcpy(nn, cn->u.cmd);

@@ -859,7 +859,7 @@ mod_export Cmdnam

 hashcmd(char *arg0, char **pp)

 {

     Cmdnam cn;

-    char *s, buf[PATH_MAX];

+    char *s, buf[PATH_MAX+1];

     char **pq;

     for (; *pp; pp++)

@@ -4919,7 +4919,7 @@ runshfunc(Eprog prog, FuncWrap wrap, char *name)

 Eprog

 getfpfunc(char *s, int *ksh, char **fname)

 {

-    char **pp, buf[PATH_MAX];

+    char **pp, buf[PATH_MAX+1];

     off_t len;

     off_t rlen;

     char *d;

@@ -5047,7 +5047,7 @@ cancd(char *s)

     char *t;

     if (*s != '/') {

-	char sbuf[PATH_MAX], **cp;

+	char sbuf[PATH_MAX+1], **cp;

 	if (cancd2(s))

 	    return s;

diff --git a/Src/glob.c b/Src/glob.c

index 9135fce..92ed8b5 100644

--- a/Src/glob.c

+++ b/Src/glob.c

@@ -271,7 +271,7 @@ addpath(char *s, int l)

 static int

 statfullpath(const char *s, struct stat *st, int l)

 {

-    char buf[PATH_MAX];

+    char buf[PATH_MAX+1];

     DPUTS(strlen(s) + !*s + pathpos - pathbufcwd >= PATH_MAX,

 	  "BUG: statfullpath(): pathname too long");

@@ -775,7 +775,7 @@ parsepat(char *str)

     /* Now there is no (#X) in front, we can check the path. */

     if (!pathbuf)

-	pathbuf = zalloc(pathbufsz = PATH_MAX);

+	pathbuf = zalloc(pathbufsz = PATH_MAX+1);

     DPUTS(pathbufcwd, "BUG: glob changed directory");

     if (*str == '/') {		/* pattern has absolute path */

 	str++;

diff --git a/Src/hist.c b/Src/hist.c

index 9a63c15..6764eaf 100644

--- a/Src/hist.c

+++ b/Src/hist.c

@@ -1658,7 +1658,7 @@ chrealpath(char **junkptr)

     char *lastpos, *nonreal, *real;

 #else

 # ifdef HAVE_REALPATH

-    char *lastpos, *nonreal, real[PATH_MAX];

+    char *lastpos, *nonreal, real[PATH_MAX+1];

 # endif

 #endif

diff --git a/Src/utils.c b/Src/utils.c

index 05eeda4..13910a4 100644

--- a/Src/utils.c

+++ b/Src/utils.c

@@ -930,7 +930,7 @@ finddir(char *s)

 	if(homenode.diff==1)

 	    homenode.diff = 0;

 	if(!finddir_full)

-	    finddir_full = zalloc(ffsz = PATH_MAX);

+	    finddir_full = zalloc(ffsz = PATH_MAX+1);

 	finddir_full[0] = 0;

 	return finddir_last = NULL;

     }

@@ -1418,7 +1418,7 @@ checkmailpath(char **s)

 	} else if (S_ISDIR(st.st_mode)) {

 	    LinkList l;

 	    DIR *lock = opendir(unmeta(*s));

-	    char buf[PATH_MAX * 2], **arr, **ap;

+	    char buf[PATH_MAX * 2 + 1], **arr, **ap;

 	    int buflen, ct = 1;

 	    if (lock) {

@@ -5828,7 +5828,7 @@ strsfx(char *s, char *t)

 static int

 upchdir(int n)

 {

-    char buf[PATH_MAX];

+    char buf[PATH_MAX+1];

     char *s;

     int err = -1;

-- 

2.20.1