From: Christoph M. Becker Date: Fri, 3 Apr 2020 12:11:04 +0000 (+0200) Subject: Fix #68690: Hypothetical off-by-one condition X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17d4e66204466cb5e3c0eb32aa18b8dbd9774ce3;p=php Fix #68690: Hypothetical off-by-one condition We fix this, even though `filter->cache == jisx0213_u2_tbl_len` can never be true here. --- diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c index 481ae557cc..8079c926e3 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c @@ -508,7 +508,7 @@ retry: /* check for 2nd char of combining characters */ if ((filter->status & 0xf) == 1 && - filter->cache >= 0 && filter->cache <= jisx0213_u2_tbl_len) { + filter->cache >= 0 && filter->cache < jisx0213_u2_tbl_len) { k = filter->cache; filter->status &= ~0xf; filter->cache = 0;