Issue #6697: Fix a crash if a keyword contains a surrogate
2 files changed