diff options
| author | Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> | 2014-12-09 02:41:01 +0900 |
|---|---|---|
| committer | Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> | 2014-12-09 02:41:01 +0900 |
| commit | 0a07ffd47cb5000ff32d5fc5905e7d3e87603d16 (patch) | |
| tree | 50156e820693a0ac5fe0a6b72d44e6c756f06303 | |
| parent | 33924: allow vi line/characterwise mode to be forced (diff) | |
| download | zsh-0a07ffd47cb5000ff32d5fc5905e7d3e87603d16.tar zsh-0a07ffd47cb5000ff32d5fc5905e7d3e87603d16.tar.gz zsh-0a07ffd47cb5000ff32d5fc5905e7d3e87603d16.tar.bz2 zsh-0a07ffd47cb5000ff32d5fc5905e7d3e87603d16.tar.lz zsh-0a07ffd47cb5000ff32d5fc5905e7d3e87603d16.tar.xz zsh-0a07ffd47cb5000ff32d5fc5905e7d3e87603d16.tar.zst zsh-0a07ffd47cb5000ff32d5fc5905e7d3e87603d16.zip | |
33932: revise boundary check in unmeta()
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/utils.c | 8 |
2 files changed, 7 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2014-12-09 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> + + * 33932: Src/utils.c: revise boundary check in unmeta() + 2014-12-08 Oliver Kiddle <opk@zsh.org> * 33924: Doc/Zsh/zle.yo, Src/Zle/iwidgets.list, Src/Zle/zle.h, diff --git a/Src/utils.c b/Src/utils.c index 5c90638a2..ab3d3da93 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -4208,10 +4208,8 @@ unmeta(const char *file_name) meta = 0; for (t = file_name; *t; t++) { - if (*t == Meta) { - meta = t[1]; - break; - } + if (*t == Meta) + meta = 1; } if (!meta) { /* @@ -4250,7 +4248,7 @@ unmeta(const char *file_name) } for (t = file_name, p = fn; *t; p++) - if ((*p = *t++) == Meta) + if ((*p = *t++) == Meta && *t) *p = *t++ ^ 32; *p = '\0'; return fn; |