From 4fbcda9c2a4ba59d0fbeec5ffcfe9141ed6812c9 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Tue, 24 Jul 2018 22:00:25 +0100 Subject: [PATCH] FindReplacementChars: Use an nc (next character) variable. --- src/libespeak-ng/translate.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libespeak-ng/translate.c b/src/libespeak-ng/translate.c index a1d43918..96b7a4e4 100644 --- a/src/libespeak-ng/translate.c +++ b/src/libespeak-ng/translate.c @@ -1795,15 +1795,19 @@ static const char *FindReplacementChars(Translator *tr, const char **pfrom, unsi const char *from = *pfrom; while (*(unsigned int *)from != 0) { unsigned int fc = 0; // from character + unsigned int nc = c; // next character *pfrom = from; from += utf8_in((int *)&fc, from); - if (c == fc) { + if (nc == fc) { if (*from == 0) return from + 1; from += utf8_in((int *)&fc, from); - if (*from == 0 && fc == (unsigned int)towlower2(nextc, tr)) { + nc = nextc; + + nc = towlower2(nextc, tr); + if (*from == 0 && nc == fc) { *ignore_next_n = 1; return from + 1; }