diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-12-07 11:06:07 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-12-07 11:20:01 -0800 |
| commit | 48cd1b6c3b51a7bc6d45d4aeb7ff8c55d97a6f2a (patch) | |
| tree | b6869b9fcd6dbd38566c4cd452502d2ca40220f3 | |
| parent | 9ddd022ff03efd90bac9f1057e61ad74b5cdbc9a (diff) | |
| download | zsh-48cd1b6c3b51a7bc6d45d4aeb7ff8c55d97a6f2a.tar.gz zsh-48cd1b6c3b51a7bc6d45d4aeb7ff8c55d97a6f2a.tar.xz zsh-48cd1b6c3b51a7bc6d45d4aeb7ff8c55d97a6f2a.zip | |
33894: boundary conditions in unmeta(), unmetafy()
Check that we aren't running off the end of the string when converting the next byte after a Meta byte. This is just defensive programming in case of bad metafied strings coming through from gettokstr(), some repairs there are likely still needed.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/utils.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index eec56154d..25a7ce278 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-12-07 Barton E. Schaefer <schaefer@zsh.org> + + * 33894: Src/utils.c: boundary conditions in unmeta(), unmetafy() + 2014-12-07 Peter Stephenson <p.w.stephenson@ntlworld.com> * Daniel Shahaf: 33883: Doc/Zsh/expn.yo, diff --git a/Src/utils.c b/Src/utils.c index 926814759..5c90638a2 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -4164,7 +4164,7 @@ unmetafy(char *s, int *len) for (p = s; *p && *p != Meta; p++); for (t = p; (*t = *p++);) - if (*t++ == Meta) + if (*t++ == Meta && *p) t[-1] = *p++ ^ 32; if (len) *len = t - s; @@ -4208,8 +4208,10 @@ unmeta(const char *file_name) meta = 0; for (t = file_name; *t; t++) { - if (*t == Meta) - meta = 1; + if (*t == Meta) { + meta = t[1]; + break; + } } if (!meta) { /* |