diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-12-15 16:41:08 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-12-15 16:41:08 -0800 |
| commit | 36ec763dbd4e30b614f491482b77fd4e0507fe85 (patch) | |
| tree | a1b679e18b52596fb55077bec62a5a586f36cb68 | |
| parent | users/19530: Handle commented lines in /etc/filesystems (diff) | |
| download | zsh-36ec763dbd4e30b614f491482b77fd4e0507fe85.tar zsh-36ec763dbd4e30b614f491482b77fd4e0507fe85.tar.gz zsh-36ec763dbd4e30b614f491482b77fd4e0507fe85.tar.bz2 zsh-36ec763dbd4e30b614f491482b77fd4e0507fe85.tar.lz zsh-36ec763dbd4e30b614f491482b77fd4e0507fe85.tar.xz zsh-36ec763dbd4e30b614f491482b77fd4e0507fe85.tar.zst zsh-36ec763dbd4e30b614f491482b77fd4e0507fe85.zip | |
33976: fix overlapping strcpy()
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/subst.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2014-12-15 Barton E. Schaefer <schaefer@zsh.org> + + * 33976: Src/subst.c: fix overlapping strcpy() + 2014-12-14 Mikael Magnusson <mikachu@gmail.com> * users/19530: Completion/Unix/Type/_file_systems: Handle diff --git a/Src/subst.c b/Src/subst.c index 43932c256..4100803e7 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -298,7 +298,7 @@ stringsubst(LinkList list, LinkNode node, int pf_flags, int asssub) if (endchar == Outpar) str2--; if (!(s = (char *) ugetnode(pl))) { - str = strcpy(str2, str); + str = (char *)memmove(str2, str, strlen(str)+1); continue; } if (!qt && (pf_flags & PREFORK_SINGLE) && isset(GLOBSUBST)) |