fix potential infinite loop in mbrevstrpbrk()

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3270 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2006-02-02 22:30:40 +00:00
parent 3a5e6f9317
commit 66d3ebf6a6
1 changed files with 7 additions and 2 deletions

View File

@ -910,14 +910,19 @@ char *mbrevstrpbrk(const char *s, const char *accept, const char
#ifdef ENABLE_UTF8
if (ISSET(USE_UTF8)) {
while (rev_start >= s) {
bool begin_line = FALSE;
while (!begin_line) {
const char *q = (*rev_start == '\0') ? NULL :
mbstrchr(accept, rev_start);
if (q != NULL)
return (char *)rev_start;
rev_start = s + move_mbleft(s, rev_start - s);
if (rev_start == s)
begin_line = TRUE;
else
rev_start = s + move_mbleft(s, rev_start - s);
}
return NULL;