diff options
| author | Wayne Davison <wayned@users.sourceforge.net> | 2006-01-09 01:09:55 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@users.sourceforge.net> | 2006-01-09 01:09:55 +0000 |
| commit | 5750513c004166d4665e63c5a254d85a86efa7c5 (patch) | |
| tree | 060798768e0a11b2fdeee5640764c17a2413b462 | |
| parent | 223ade988bb31d5e79ea804b2949e3d547d04f76 (diff) | |
| download | zsh-5750513c004166d4665e63c5a254d85a86efa7c5.tar.gz zsh-5750513c004166d4665e63c5a254d85a86efa7c5.zip | |
The return value of mbrtowc() is a size_t (unsigned), so don't
assign it to an int and then check if it's < 0, as that won't
work on a system where an int is larger than a size_t. Also,
the code that handled partial multibyte characters (that were
assembled from multiple bytes of a metafied string) was not
advancing past all the assembled bytes, nor was it handling the
decoding of a '\0' char (it looks like it could have infinite
looped in that case).
| -rw-r--r-- | Src/Zle/compmatch.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c index 4449f3554..cd77450cd 100644 --- a/Src/Zle/compmatch.c +++ b/Src/Zle/compmatch.c @@ -1645,7 +1645,8 @@ sub_match(Cmdata md, char *str, int len, int sfx) * ret must, in fact, be set by the current logic, * but gcc doesn't realise (at least some versions don't). */ - int ret = -1, diff; + size_t cnt = (size_t)-1; + int diff; char *p2; /* @@ -1653,15 +1654,13 @@ sub_match(Cmdata md, char *str, int len, int sfx) * assembled wide characters a byte at a time. */ for (p2 = p; p2 < fullstr + fulllen; p2++) { - char curchar = (*p2 == Meta) ? (*++p2 ^ 32) : *p2; - ret = mbrtowc(&wc, &curchar, 1, &ps); - /* - * Continue while character is incomplete. - */ - if (ret != -2) - break; + char curchar = (*p2 == Meta) ? (*++p2 ^ 32) : *p2; + cnt = mbrtowc(&wc, &curchar, 1, &ps); + /* Continue while character is incomplete. */ + if (cnt != (size_t)-2) + break; } - if (ret < 0) { + if (cnt == (size_t)-1) { /* not a valid character, give up test */ break; } @@ -1694,7 +1693,7 @@ sub_match(Cmdata md, char *str, int len, int sfx) break; } /* Advance over full character */ - p += ret; + p = p2; } } #endif |