APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1489281572 0 # Sun Mar 12 01:19:32 2017 +0000 # Node ID 68c079d5d2cfece266b448b3412d7667c87c86d0 # Parent 55b8780e42f49fe8abaeb84784316dfc4727b70b Don't crash when ERROR_CHECK_TEXT, itext_ichar_eql() src/ChangeLog addition: 2017-03-12 Aidan Kehoe <kehoea(a)parhasard.net&gt; * text.h (itext_ichar_eql): Don't crash when ERROR_CHECK_TEXT is turned on and we're comparing an ASCII CH to a non-ASCII *str. diff -r 55b8780e42f4 -r 68c079d5d2cf src/ChangeLog --- a/src/ChangeLog Sun Mar 12 01:16:13 2017 +0000 +++ b/src/ChangeLog Sun Mar 12 01:19:32 2017 +0000 ＠＠ -1,3 +1,9 ＠＠ +2017-03-12 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * text.h (itext_ichar_eql): + Don't crash when ERROR_CHECK_TEXT is turned on and we're comparing + an ASCII CH to a non-ASCII *str. + 2017-03-11 Aidan Kehoe <kehoea(a)parhasard.net&gt; * redisplay-xlike-inc.c (separate_textual_runs_xft_mule): diff -r 55b8780e42f4 -r 68c079d5d2cf src/text.h --- a/src/text.h Sun Mar 12 01:16:13 2017 +0000 +++ b/src/text.h Sun Mar 12 01:19:32 2017 +0000 ＠＠ -1914,7 +1914,7 ＠＠ if (ichar_ascii_p (ch)) /* This is fine, since ASCII characters are not part of the subsequent octets of non-ASCII characters. */ - return simple_itext_ichar (str) == ch; + return *str == (Ibyte) ch; #ifdef MULE return non_ascii_itext_ichar (str) == ch; #endif -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)