From: Patrick McCarty <pnorcks@gmail.com>
Date: Fri, 30 Oct 2009 02:00:58 +0000 (-0700)
Subject: Fix UTF-8 validation checks
X-Git-Tag: release/2.13.7-0~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=12a8d052900da9adc9a598fd998a49a55873fb32;p=lilypond.git

Fix UTF-8 validation checks

The bitwise comparisons are only for 8-bit characters, not 32-bit
characters.

The checks were mixing up binary and hex.  :-)
---

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index c7d425bcb5..8f2f7edc06 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -31,15 +31,15 @@ replace_whitespace (string *str)
       char cur = (*str)[i];
       
       // U+10000 - U+10FFFF
-      if ((cur & 0x11110000) == 0x11110000)
+      if ((cur & 0xF0) == 0xF0)
 	char_len = 4;
       // U+0800 - U+FFFF
-      else if ((cur & 0x11100000) == 0x11100000)
+      else if ((cur & 0xE0) == 0xE0)
 	char_len = 3;
       // U+0080 - U+07FF
-      else if ((cur & 0x11000000) == 0x11000000)
+      else if ((cur & 0xC0) == 0xC0)
 	char_len = 2;
-      else if (cur & 0x10000000)
+      else if (cur & 0x80)
 	programming_error ("invalid utf-8 string");
       else
 	// avoid the locale-dependent isspace